Changeset 24255

Timestamp:

10/13/13 02:16:16 (9 years ago)

Author:

obi

Message:

fix

Location:

titan/plugins/tithek

Files:

• filenuke.h (modified) (3 diffs)
• flashx.h (modified) (9 diffs)

titan/plugins/tithek/filenuke.h

@@ -6 +6 @@
         debug(99, "in host: %s file: %s", host, file);
         int debuglevel = getconfigint("debuglevel", NULL);
-        char* tmphost = NULL;
-        char* tmpfile = NULL;
-        char* tmpstr = NULL;
-        char* send = NULL;
-        char* id = NULL;
-        char* fname = NULL;
-        char* op = NULL;
-        char* hash = NULL;
-        char* hashlen = NULL;   
-        char* ip = NULL;
-        char* b36code = NULL;
-        char* base = NULL;
-        char* search = NULL;
-        char* post = NULL;
-        char* streamlink = NULL;
-        char* cmd = NULL;
-
-        char* tmpstr2 = NULL;
-        char* tmpstr3 = NULL;
-        char* charlist = NULL;
+        char* tmphost = NULL, *error = NULL, *tmpfile = NULL, *tmpstr = NULL, *send = NULL, *id = NULL, *fname = NULL, *op = NULL, *hash = NULL, *hashlen = NULL, *ip = NULL;
+        char* b36code = NULL, *base = NULL, *search = NULL, *post = NULL, *streamlink = NULL, *cmd = NULL, *tmpstr2 = NULL, *tmpstr3 = NULL, *charlist = NULL;
 
         if(host == NULL || file == NULL) return NULL;
 
-        tmphost = ostrcat(host, NULL, 0, 0);
+        tmphost = ostrcat("www.", host, 0, 0);
         tmpfile = ostrcat("/", file, 0, 0);
         debug(99, "tmphost: %s", tmphost);
@@ -43 +25 @@
         if(ostrstr(tmpstr, "<title>The page is temporarily unavailable</title>") != NULL)
         {
-                tmpstr = string_resub("<td align=\"center\" valign=\"middle\">", "</td>", tmpstr, 1);
-                string_deltags(tmpstr);
-                tmpstr = string_replace("Terms", "\nTerms", tmpstr, 1);
-                tmpstr = strstrip(tmpstr);
-                if(tmpstr == NULL || strlen(tmpstr) == 0)
-                        tmpstr = ostrcat(_("The page is temporarily unavailable"), tmpstr, 0, 1);
-                textbox(_("Message"), tmpstr, _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1200, 400, 0, 0);
+                error = string_resub("<td align=\"center\" valign=\"middle\">", "</td>", tmpstr, 0);
+                string_deltags(error);
+                error = string_replace("Terms", "\nTerms", error, 1);
+                error = strstrip(error);
+                if(error == NULL || strlen(error) == 0)
+                        error = ostrcat(_("The page is temporarily unavailable"), error, 0, 1);
+                textbox(_("Message"), error, _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1200, 400, 0, 0);
                 goto end;
         }
@@ -235 +217 @@
 end:
 
+        free(error); error = NULL;
         free(tmphost); tmphost = NULL;
         free(tmpfile); tmpfile = NULL;

titan/plugins/tithek/flashx.h

@@ -8 +8 @@
         debug(99, "hosterurl: %s", hosterurl);
         int debuglevel = getconfigint("debuglevel", NULL);
-        char* tmphost = NULL;
-        char* tmppath = NULL;
-        char* tmpstr = NULL;
-        char* send = NULL;
-        char* streamlink = NULL;
-        char* ip = NULL, *pos = NULL, *path = NULL;
+        char* tmphost = NULL, *tmppath = NULL, *tmpstr = NULL, *send = NULL, *streamlink = NULL, *ip = NULL, *pos = NULL, *path = NULL, *error = NULL;
 
         if(host == NULL || file == NULL) return NULL;
@@ -43 +38 @@
         tmpstr = gethttpreal(tmphost, tmppath, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
         titheklog(debuglevel, "/tmp/flashx_tmpstr_get1", NULL, tmpstr);
-//      writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get1", tmpstr, 0);
-//printf("\n#######################################################\n");
-
+        writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get1", tmpstr, 0);
+//printf("\n#######################################################\n");
+ 
+        if(ostrstr(tmpstr, "<center>Video not found, deleted or abused, sorry!<br") != NULL)
+        {
+                error = string_resub("<li> <center>", "<br", tmpstr, 0);
+                string_deltags(error);
+                error = strstrip(error);
+                if(error == NULL || strlen(error) == 0)
+                        error = ostrcat(_("The page is temporarily unavailable"), NULL, 0, 0);
+                textbox(_("Message"), error, _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1200, 400, 0, 0);
+                goto end;
+        }
+        
         char* cookie1 = string_resub("Set-Cookie: pageredir=", ";", tmpstr, 0);
         debug(99, "cookie1: %s", cookie1);
@@ -84 +90 @@
 
         titheklog(debuglevel, "/tmp/flashx_tmpstr_get2", NULL, tmpstr);
-//      writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get2", tmpstr, 0);
+        writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get2", tmpstr, 0);
 //printf("\n#######################################################\n");
 
@@ -90 +96 @@
         char* hash2tmp = string_resub("<input type=\"hidden\" name=\"id\" value=\"", "\"", tmpstr, 0);
         
+        if(hash1tmp == NULL || hash2tmp == NULL) goto end;
         char* hash1 = htmlencode(hash1tmp);
         char* hash2 = htmlencode(hash2tmp);
+        free(hash1tmp); hash1tmp = NULL;
+        free(hash2tmp); hash2tmp = NULL;
         
         // htmldecod cant / to %2f
@@ -101 +110 @@
         hash = ostrcat(hash, hash2, 0, 0);
         char* hashlen = NULL;
+
+        if(hash == NULL) goto end;
         hashlen = oitoa(strlen(hash));
         debug(99, "hashlen: %s", hashlen);
@@ -122 +133 @@
         send = ostrcat(send, "\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n", 1, 0);      
         send = ostrcat(send, hash, 1, 0);
-
+        free(hash); hash = NULL;
+        free(hashlen); hashlen = NULL;
+        
         debug(99, "send: %s", send);
         tmpstr = gethttpreal(tmphost, "/player/show.php", 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
 
         titheklog(debuglevel, "/tmp/flashx_tmpstr_get3", NULL, tmpstr);
-//      writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get3", tmpstr, 0);
+        writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get3", tmpstr, 0);
 //printf("\n#######################################################\n");
 //var code ='<object id="nuevoplayer" width="'+ww+'" height="'+hh+'" data="http://play.flashx.tv/nuevo/player/player.swf?config=http://play.flashx.tv/nuevo/player/play.php?str=4MfrzrW4qrPKnM2dw5/Fvcs=" type="application/x-shockwave-flash">';
@@ -161 +174 @@
 
         titheklog(debuglevel, "/tmp/flashx_tmpstr_get4", NULL, tmpstr);
-//      writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get4", tmpstr, 0);
+        writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get4", tmpstr, 0);
 //printf("\n#######################################################\n");
 
@@ -204 +217 @@
         if(getconfigint("debuglevel", NULL) == 99)
                 writesys("/tmp/flashx_tmpstr_get5", tmpstr, 0);
-//      writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get5", tmpstr, 0);
+        writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get5", tmpstr, 0);
 //printf("\n#######################################################\n");
 
@@ -211 +224 @@
                 writesys("/tmp/flashx5_streamlink", streamlink, 0);
 
-//end:
+end:
+        free(error); error = NULL;
         free(tmphost); tmphost = NULL;
         free(tmphost); tmphost = NULL;