Changeset 30097

Timestamp:

09/24/14 20:57:08 (9 years ago)

Author:

obi

Message:

fix

File:

• titan/titan/httpd.h (modified) (3 diffs)

titan/titan/httpd.h

@@ -611 +611 @@
                                 fullfilename = ostrcat(filename, NULL, 0, 0);
                         else
+                        {
                                 fullfilename = ostrcat(getconfig("httpdpath", NULL), filename, 0, 0);
+
+                                if(ostrstr(filename, ".html") != NULL)
+                                {
+                                        debug(250, "filename: %s", filename);
+                                        debug(250, "fullfilename: %s", fullfilename);
+                                        
+                                        char* tmphtml = readfiletomem(fullfilename, 0);
+                        
+                                        debug(250, "#### tmphtml1 ##################################");
+                                        debug(250, "tmphtml1: %s", buf);
+                                        
+                                        while(ostrstr(tmphtml, "_\(\"") != NULL)
+                                        {
+                                                char* tmpstr1 = string_resub("_(\"", "\")", tmphtml, 0);
+                                                char* tmpstr2 = ostrcat("_(\"", tmpstr1, 0, 0);
+                                                tmpstr2 = ostrcat(tmpstr2, "\")", 1, 0);
+        
+                                                debug(250, "--------------------------------------");
+                                                debug(250, "Search  string: %s", tmpstr2);
+                                                debug(250, "Replace string: %s", tmpstr1);
+                                                debug(250, "Replace %s -> %s", tmpstr2, tmpstr1);
+                                                debug(250, "--------------------------------------");
+        
+                                                tmphtml = string_replace_all(tmpstr2, _(tmpstr1), tmphtml, 1);
+                                                free(tmpstr1), tmpstr1 = NULL;
+                                                free(tmpstr2), tmpstr2 = NULL;
+                                        }
+                                        debug(250, "#### tmphtml2 ##################################");
+                                        debug(250, "tmphtml2: %s", tmphtml);
+                                        
+                                        free(fullfilename), fullfilename = NULL;
+                                        fullfilename = ostrcat("/tmp/.", filename, 0, 0);
+                                        writesys(fullfilename, tmphtml, 0);     
+                                }
+                        }
+
                         filefd = open(fullfilename, O_RDONLY | O_LARGEFILE);
                         if(filefd < 0)
@@ -641 +678 @@
                         }
 
-                        int translate = 0;
-                        if(ostrstr(filename, ".html") != NULL)
-                        {
-                                translate = 1;
-                                debug(250, "#### buf1 ##################################");
-                                debug(250, "filename: %s", filename);
-                                debug(250, "fullfilename: %s/%s", getconfig("httpdpath", NULL), filename);                              
-                                debug(250, "buf1: %s", buf);
-                        }
-
                         //TODO:
                         int readret = 1;
@@ -656 +683 @@
                         {
                                 readret = dvbreadfd(filefd, buf, 0, MINMALLOC, 1000, 0);
-                                if(translate == 1)
-                                {
-                                        debug(250, "#### buf2 ##################################");
-                                        debug(250, "buf2: %s", buf);
-                                }       
-                                if(translate == 1)
-                                {
-                                        while(ostrstr(buf, "_\(\"") != NULL)
-                                        {
-                                                char* tmpstr1 = string_resub("_(\"", "\")", buf, 0);
-                                                char* tmpstr2 = ostrcat("_(\"", tmpstr1, 0, 0);
-                                                tmpstr2 = ostrcat(tmpstr2, "\")", 1, 0);
-
-                                                debug(250, "--------------------------------------");
-                                                debug(250, "Search  string: %s", tmpstr2);
-                                                debug(250, "Replace string: %s", tmpstr1);
-                                                debug(250, "Replace %s -> %s", tmpstr2, tmpstr1);
-                                                debug(250, "--------------------------------------");
-        
-                                                buf = string_replace_all(tmpstr2, _(tmpstr1), buf, 1);
-                                                free(tmpstr1), tmpstr1 = NULL;
-                                                free(tmpstr2), tmpstr2 = NULL;
-                                        }
-                                        debug(250, "#### buf3 ##################################");
-                                        debug(250, "buf3: %s", buf);            
-                                }
+
                                 if(readret > 0)
                                         socksend(connfd, buf, readret, 5000 * 1000);
-
                         }
                 }