[pLog-svn] r598 - plog/trunk

[oscar at devel.plogworld.net]

Author: oscar
Date: 2004-12-29 13:25:58 +0000 (Wed, 29 Dec 2004)
New Revision: 598

Modified:
   plog/trunk/wizard.php
Log:
whoops, not quite the fix I wanted...

Modified: plog/trunk/wizard.php
===================================================================
--- plog/trunk/wizard.php	2004-12-29 13:22:18 UTC (rev 597)
+++ plog/trunk/wizard.php	2004-12-29 13:25:58 UTC (rev 598)
@@ -817,12 +817,12 @@
             }
 
             // try to guess the url where plog is running
-            $httpHost = $_SERVER["HTTP_HOST"];
-            $requestUrl = $_SERVER["REQUEST_URI"];
-            $requestUrl = str_replace( "/wizard.php", "", $requestUrl );
-			$server = HttpVars::getServer();
-			$plogUrl = ($server["HTTPS"] == "on" ) ? "https://" : "http://";
-            $plogUrl = "http://".$httpHost.$requestUrl;
+             // try to guess the url where plog is running
+             $httpProtocol = ($_SERVER["HTTPS"] == "on") ? "https://" : "http://";
+             $httpHost = $_SERVER["HTTP_HOST"];
+             $requestUrl = $_SERVER["REQUEST_URI"];
+             $requestUrl = str_replace( "/wizard.php", "", $requestUrl );
+             $plogUrl = $httpProtocol.$httpHost.$requestUrl;
 
             // Find some of the tools we are going to need (last one is for os x, with fink installed)
             $folders = Array( "/bin/", "/usr/bin/", "/usr/local/bin/", "/sw/bin/" );