From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Tue, 1 Apr 2008 13:22:48 +0000 (+0200)
Subject: Adds a baseurl_http global var (used for RSS urls which can't be fixed by xorg.js... 
X-Git-Tag: xorg/0.9.16~31
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=131b15a7e86adcf7c865b5cd36c5454c35bdc610;p=platal.git

Adds a baseurl_http global var (used for RSS urls which can't be fixed by xorg.js's auto_links).
Was supposed to be part of 769dc7d5, but changes were made to include/googleapps.inc.php.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
---

diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in
index 4fc17fa..c5148e4 100644
--- 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();