X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fglobals.inc.php.in;h=f052c6bc2d76c7863a5265f46e10f9259510310a;hb=032b244ed3fd10b934697f2636fc9a4574822408;hp=4fc17fa7b6604591d0ed6316561b0dafd9a39f49;hpb=5f30b30e8b2657ade5c727e98de286386ee002d8;p=platal.git diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in index 4fc17fa..f052c6b 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(); @@ -206,7 +208,9 @@ class PlatalGlobals } if ($gp) { - $res = XDB::query('SELECT a.*, d.nom AS domnom, FIND_IN_SET(\'wiki_desc\', a.flags) AS wiki_desc + $res = XDB::query('SELECT a.*, d.nom AS domnom, + FIND_IN_SET(\'wiki_desc\', a.flags) AS wiki_desc, + FIND_IN_SET(\'notif_unsub\', a.flags) AS notif_unsub FROM groupex.asso AS a LEFT JOIN groupex.dom AS d ON d.id = a.dom WHERE diminutif = {?}', $gp);