Changeset 41939
- Timestamp:
- 02/24/18 21:52:22 (6 years ago)
- Location:
- titan
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/tithek/kinox.h
r41933 r41939 65 65 { 66 66 path = string_replace_all("kinox.to", "", search, 0); 67 path = string_replace_all(getconfig(" kinox_url", NULL), "", search, 0);67 path = string_replace_all(getconfig("tithek_kinox_url", NULL), "", search, 0); 68 68 path = string_replace_all("http:///", "", search, 0); 69 69 path = string_replace_all("https:///", "", search, 0); 70 70 } 71 71 // tmpstr = gethttp(ip, path, 80, NULL, NULL, 10000, NULL, 0); 72 newurl = ostrcat(getconfig(" kino_url", NULL), "/", 0, 0);72 newurl = ostrcat(getconfig("tithek_kinox_url", NULL), "/", 0, 0); 73 73 newurl = ostrcat(newurl, path, 1, 0); 74 74 // tmpstr = gethttps(newurl, NULL, NULL, NULL, NULL, NULL, 1); … … 117 117 118 118 // tmpstr1 = gethttp("kinox.to", path, 80, NULL, NULL, 10000, NULL, 0); 119 newurl = ostrcat(getconfig(" kinox_url", NULL), "/", 0, 0);119 newurl = ostrcat(getconfig("tithek_kinox_url", NULL), "/", 0, 0); 120 120 newurl = ostrcat(newurl, path, 1, 0); 121 121 // tmpstr1 = gethttps(newurl, NULL, NULL, NULL, NULL, NULL, 1); … … 142 142 title = ostrcat(title , lang, 1, 0); 143 143 144 url = ostrcat(getconfig(" kinox_url", NULL), "/", 0, 0);144 url = ostrcat(getconfig("tithek_kinox_url", NULL), "/", 0, 0); 145 145 url = ostrcat(url, path, 1, 0); 146 146 … … 159 159 line = ostrcat(line, url, 1, 0); 160 160 line = ostrcat(line, "#http://", 1, 0); 161 line = ostrcat(line, getconfig(" kinox_url", NULL), 1, 0);161 line = ostrcat(line, getconfig("tithek_kinox_url", NULL), 1, 0); 162 162 line = ostrcat(line, "/", 1, 0); 163 163 line = ostrcat(line, pic, 1, 0); … … 412 412 hlink = string_replace_all("amp;Hoster", "Hoster", hlink, 1); 413 413 hname = string_resub("<div class=\"Named\">", "</div>", ret1[i].part, 0); 414 pathnewtmp = ostrcat(getconfig(" kinox_url", NULL), "/aGET/Mirror/", 0, 0);414 pathnewtmp = ostrcat(getconfig("tithek_kinox_url", NULL), "/aGET/Mirror/", 0, 0); 415 415 pathnewtmp = ostrcat(pathnewtmp, hlink, 1, 0); 416 416 pathnew = ostrcat(pathnewtmp, NULL, 0, 0); … … 421 421 hlink = ostrcat(hlink, "Mirror=", 0, 0); 422 422 hname = string_resub("<div class=\"Named\">", "</div>", ret1[i].part, 0); 423 pathnewtmp = ostrcat(getconfig(" kinox_url", NULL), "/aGET/Mirror/", 0, 0);423 pathnewtmp = ostrcat(getconfig("tithek_kinox_url", NULL), "/aGET/Mirror/", 0, 0); 424 424 pathnewtmp = ostrcat(pathnewtmp, hlink, 1, 0); 425 425 pathnew = ostrcat(pathnewtmp, oitoa(j), 0, 1); … … 818 818 819 819 searchname = string_replace("kinox.to", "", searchname, 0); 820 searchname = string_replace(getconfig(" kinox_url", NULL), "", searchname, 0);820 searchname = string_replace(getconfig("tithek_kinox_url", NULL), "", searchname, 0); 821 821 searchname = string_replace("http:////Stream/", "", searchname, 0); 822 822 searchname = string_replace("http:///Stream/", "", searchname, 0); … … 872 872 873 873 free(tmpstr), tmpstr = NULL; 874 // tmpstr = gethttp(getconfig(" kinox_url", NULL, pathnew, 80, NULL, NULL, 10000, NULL, 0);875 newurl = ostrcat(getconfig(" kinox_url", NULL), "/", 0, 0);874 // tmpstr = gethttp(getconfig("tithek_kinox_url", NULL, pathnew, 80, NULL, NULL, 10000, NULL, 0); 875 newurl = ostrcat(getconfig("tithek_kinox_url", NULL), "/", 0, 0); 876 876 newurl = ostrcat(newurl, pathnew, 1, 0); 877 877 // tmpstr = gethttps(newurl, NULL, NULL, NULL, NULL, NULL, 1); … … 938 938 hlink = string_replace_all("amp;Hoster", "Hoster", hlink, 1); 939 939 hname = string_resub("<div class=\"Named\">", "</div>", ret1[i].part, 0); 940 pathnewtmp = ostrcat(getconfig(" kinox_url", NULL), "/aGET/Mirror/", 0, 0);940 pathnewtmp = ostrcat(getconfig("tithek_kinox_url", NULL), "/aGET/Mirror/", 0, 0); 941 941 pathnewtmp = ostrcat(pathnewtmp, hlink, 1, 0); 942 942 pathnew = ostrcat(pathnewtmp, NULL, 0, 0); … … 947 947 hlink = ostrcat(hlink, "Mirror=", 0, 0); 948 948 hname = string_resub("<div class=\"Named\">", "</div>", ret1[i].part, 0); 949 pathnewtmp = ostrcat(getconfig(" kinox_url", NULL), "/aGET/Mirror/", 0, 0);949 pathnewtmp = ostrcat(getconfig("tithek_kinox_url", NULL), "/aGET/Mirror/", 0, 0); 950 950 pathnewtmp = ostrcat(pathnewtmp, hlink, 1, 0); 951 951 pathnew = ostrcat(pathnewtmp, oitoa(j), 0, 1); … … 976 976 977 977 hlink = string_replace("kinox.to", "", hlink, 1); 978 hlink = string_replace(getconfig(" kinox_url", NULL), "", hlink, 1);978 hlink = string_replace(getconfig("tithek_kinox_url", NULL), "", hlink, 1); 979 979 hlink = string_replace("http:////Stream/", "", hlink, 1); 980 980 hlink = string_replace("http:///Stream/", "", hlink, 1); … … 1004 1004 { 1005 1005 free(pathnew), pathnew = NULL; 1006 pathnew = ostrcat(getconfig(" kinox_url", NULL), "/aGET/Mirror/", 0, 0);1006 pathnew = ostrcat(getconfig("tithek_kinox_url", NULL), "/aGET/Mirror/", 0, 0); 1007 1007 pathnew = ostrcat(pathnew, hlink, 1, 0); 1008 1008 // debug(99, "iframe2.1 pathnew: %s", pathnew); … … 1182 1182 line = ostrcat(line, name, 1, 0); 1183 1183 line = ostrcat(line, "#http://", 1, 0); 1184 line = ostrcat(line, getconfig(" kinox_url", NULL), 1, 0);1184 line = ostrcat(line, getconfig("tithek_kinox_url", NULL), 1, 0); 1185 1185 line = ostrcat(line, "/People/", 1, 0); 1186 1186 line = ostrcat(line, url, 1, 0); -
titan/plugins/tithek/tithek.c
r41935 r41939 123 123 status.listboxselectcol = convertcol("tithek_selectcol"); 124 124 125 if(getconfig(" kino_url", NULL) == NULL)126 addconfigtmp(" kino_url", "kinox.io");125 if(getconfig("tithek_kinox_url", NULL) == NULL) 126 addconfigtmp("tithek_kinox_url", "kinox.io"); 127 127 128 128 // if(checkbox("WHITEBOX") == 1) -
titan/plugins/tithek/tithek_settings.h
r41862 r41939 18 18 struct skin* vk_user = getscreennode(tithek_settings, "vk_user"); 19 19 struct skin* vk_pass = getscreennode(tithek_settings, "vk_pass"); 20 struct skin* kino _url = getscreennode(tithek_settings, "kino_url");20 struct skin* kinox_url = getscreennode(tithek_settings, "kinox_url"); 21 21 struct skin* autoupdate = getscreennode(tithek_settings, "autoupdate"); 22 22 struct skin* b3 = getscreennode(tithek_settings, "b3"); … … 58 58 /* 59 59 changemask(amazon_user, "abcdefghijklmnopqrstuvwxyz"); 60 if(getconfig(" amazon_pass", NULL) == NULL)61 changeinput(amazon_user, getconfig(" amazon_user", NULL));60 if(getconfig("tithek_amazon_pass", NULL) == NULL) 61 changeinput(amazon_user, getconfig("tithek_amazon_user", NULL)); 62 62 else 63 63 changeinput(amazon_user, "****"); 64 64 65 65 changemask(amazon_pass, "abcdefghijklmnopqrstuvwxyz"); 66 if(getconfig(" amazon_pass", NULL) == NULL)67 changeinput(amazon_pass, getconfig(" amazon_pass", NULL));66 if(getconfig("tithek_amazon_pass", NULL) == NULL) 67 changeinput(amazon_pass, getconfig("tithek_amazon_pass", NULL)); 68 68 else 69 69 changeinput(amazon_pass, "****"); 70 70 */ 71 71 changemask(vk_user, "abcdefghijklmnopqrstuvwxyz"); 72 if(getconfig(" vk_pass", NULL) == NULL)73 changeinput(vk_user, getconfig(" vk_user", NULL));72 if(getconfig("tithek_vk_pass", NULL) == NULL) 73 changeinput(vk_user, getconfig("tithek_vk_user", NULL)); 74 74 else 75 75 changeinput(vk_user, "****"); 76 76 77 77 changemask(vk_pass, "abcdefghijklmnopqrstuvwxyz"); 78 if(getconfig(" vk_pass", NULL) == NULL)79 changeinput(vk_pass, getconfig(" vk_pass", NULL));78 if(getconfig("tithek_vk_pass", NULL) == NULL) 79 changeinput(vk_pass, getconfig("tithek_vk_pass", NULL)); 80 80 else 81 81 changeinput(vk_pass, "****"); 82 82 83 changemask(kino _url, "abcdefghijklmnopqrstuvwxyz");84 changeinput(kino _url, getconfig("kino_url", NULL));83 changemask(kinox_url, "abcdefghijklmnopqrstuvwxyz"); 84 changeinput(kinox_url, getconfig("tithek_kinox_url", NULL)); 85 85 86 86 if(!file_exist("/mnt/swapextensions/etc/.codecpack") && !file_exist("/var/swap/etc/.codecpack") && !file_exist("/var/etc/.codecpack")) 87 kino _url->hidden = YES;87 kinox_url->hidden = YES; 88 88 89 89 b3->hidden = YES; … … 109 109 addconfigscreencheck("tithek_hid_xxx", hidxxx, NULL); 110 110 addconfigscreencheck("tithek_autoupdate", autoupdate, NULL); 111 addconfigscreen(" kino_url", kino_url);111 addconfigscreen("tithek_kinox_url", kinox_url); 112 112 /* 113 113 if(amazon_user->ret != NULL && ostrcmp(amazon_user->ret, "****") != 0) … … 115 115 debug(99, "amazon_user: write"); 116 116 debug(99, "amazon_user: %s", amazon_user->ret); 117 addconfigscreen(" amazon_user", amazon_user);117 addconfigscreen("tithek_amazon_user", amazon_user); 118 118 } 119 119 else … … 125 125 debug(99, "amazon_pass: write"); 126 126 debug(99, "amazon_pass: %s", amazon_pass->ret); 127 addconfigscreen(" amazon_pass", amazon_pass);127 addconfigscreen("tithek_amazon_pass", amazon_pass); 128 128 } 129 129 else … … 136 136 debug(99, "vk_user: write"); 137 137 debug(99, "vk_user: %s", vk_user->ret); 138 addconfigscreen(" vk_user", vk_user);138 addconfigscreen("tithek_vk_user", vk_user); 139 139 } 140 140 else … … 146 146 debug(99, "vk_pass: write"); 147 147 debug(99, "vk_pass: %s", vk_pass->ret); 148 addconfigscreen(" vk_pass", vk_pass);148 addconfigscreen("tithek_vk_pass", vk_pass); 149 149 } 150 150 else … … 158 158 // debug(99, "amazon_pass read: %s", getconfig("amazon_pass", NULL)); 159 159 160 debug(99, "vk_user read: %s", getconfig(" vk_user", NULL));161 debug(99, "vk_pass read: %s", getconfig(" vk_pass", NULL));160 debug(99, "vk_user read: %s", getconfig("tithek_vk_user", NULL)); 161 debug(99, "vk_pass read: %s", getconfig("tithek_vk_pass", NULL)); 162 162 163 163 break; -
titan/skins/tithek/skin.xml
r41863 r41939 31 31 <node parent="listbox" name="vk_user" text="VK User" type="inputbox" valign="middle" width="100%" height="35"> 32 32 <node parent="listbox" name="vk_pass" text="VK Pass" type="inputbox" valign="middle" width="100%" height="35"> 33 <node parent="listbox" name="kino _url" text="KinoX Url" type="inputbox" valign="middle" width="100%" height="35">33 <node parent="listbox" name="kinox_url" text="KinoX Url" type="inputbox" valign="middle" width="100%" height="35"> 34 34 <node name="buttonbar" posx="0" posy="0" width="100%" height="50" hspace="5" fontcol="black" fontsize="25" bordercol="titlebgcol" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle"> 35 35 <node parent="buttonbar" name="b1" picmem="skin/key_ok_70x40.png" posx="0" posy="center" width="70" height="40">
Note: See TracChangeset
for help on using the changeset viewer.