X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fplatal%2Fglobals.inc.php.in;h=377869cf6623da86546eafc9d439f459b137be45;hb=720a960d29388e5c549ca753088618548a4172c4;hp=6948f4eb4f8815679e00548b2a548f49fae27352;hpb=50a40a33a496131e817df875607ea5542d096a64;p=platal.git

diff --git a/include/platal/globals.inc.php.in b/include/platal/globals.inc.php.in
index 6948f4e..377869c 100644
--- a/include/platal/globals.inc.php.in
+++ b/include/platal/globals.inc.php.in
@@ -21,20 +21,13 @@
 
 require_once('diogenes/diogenes.core.globals.inc.php');
 require_once('diogenes/diogenes.database.inc.php');
-require_once('platal/iterator.inc.php');
-require_once('platal/database.inc.php');
-
-// {{{ class CoreConfig
+require_once dirname(__FILE__).'/../../classes/XDB.php';
 
 class CoreConfig
 {
     var $locale = 'fr_FR';
 }
 
-// }}}
-
-// {{{ class XorgGlobals
-
 class PlatalGlobals extends DiogenesCoreGlobals
 {
     var $page    = 'XorgPage';
@@ -51,7 +44,7 @@ class PlatalGlobals extends DiogenesCoreGlobals
     var $dbhost             = 'localhost';
     var $dbuser             = 'x4dat';
     var $dbpwd              = 'x4dat';
-    
+
     var $table_auth         = 'auth_user_md5';
     var $table_log_actions  = 'logger.actions';
     var $table_log_sessions = 'logger.sessions';
@@ -62,18 +55,29 @@ class PlatalGlobals extends DiogenesCoreGlobals
     var $tlabel = array('native'=>'X.Org');
 
     /** paths */
-    var $baseurl   = 'http://localhost/xorg';
-    var $spoolroot = '/var/spool/xorg';
-    var $root      = null;
+    var $baseurl;
+    var $spoolroot;
 
     function PlatalGlobals($sess)
     {
-        $this->session = $sess;
+        $this->session   = $sess;
+
+        $base = empty($_SERVER['HTTPS']) ? 'http://' : 'https://';
+        $this->baseurl   = trim($base.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']), '/');
+        $this->spoolroot = dirname(dirname(dirname(__FILE__)));
     }
 
     function read_config()
     {
-        $array = parse_ini_file($this->root.'/configs/platal.conf', true);
+        $array = parse_ini_file($this->spoolroot.'/configs/platal.ini', true);
+        foreach ($array as $cat => $conf) {
+            $c = strtolower($cat);
+            foreach ($conf as $k => $v) {
+                $this->$c->$k = $v;
+            }
+        }
+
+        $array = parse_ini_file($this->spoolroot.'/configs/platal.conf', true);
         if (!is_array($array)) {
             return;
         }
@@ -99,7 +103,5 @@ class PlatalGlobals extends DiogenesCoreGlobals
     }
 }
 
-// }}}
-
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>