Merge branch 'platal-0.9.16'

[platal.git] / include / globals.inc.php.in

diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in
index 4fc17fa..c5148e4 100644 (file)
--- a/include/globals.inc.php.in
+++ b/include/globals.inc.php.in
@@ -43,6 +43,7 @@ class PlatalGlobals
 
     /** paths */
     public $baseurl;
+    public $baseurl_http;
     public $spoolroot;
 
     public $locale;
@@ -56,7 +57,8 @@ class PlatalGlobals
         $this->read_config();
         if (isset($_SERVER) && isset($_SERVER['SERVER_NAME'])) {
             $base = empty($_SERVER['HTTPS']) ? 'http://' : 'https://';
-            $this->baseurl   = @trim($base.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']), '/');
+            $this->baseurl      = @trim($base    .$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']), '/');
+            $this->baseurl_http = @trim('http://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']), '/');
         }
 
         $this->setlocale();