vire les alert du a la config (faut refaire un make)

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

diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in
index 7672412..b3fc66f 100644 (file)
--- a/include/globals.inc.php.in
+++ b/include/globals.inc.php.in
@@ -37,13 +37,15 @@ class PlatalGlobals
     var $baseurl;
     var $spoolroot;
 
+    var $locale;
+
     function PlatalGlobals($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__)));
+        $this->spoolroot = dirname(dirname(__FILE__));
 
         $this->read_config();
 
@@ -51,33 +53,34 @@ class PlatalGlobals
         $this->setlocale();
     }
 
-    function read_config()
+    function read_ini_file($filename)
     {
-        $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);
+        $array = parse_ini_file($filename, true);
         if (!is_array($array)) {
             return;
         }
-
-        foreach ($array as $cat=>$conf) {
+        foreach ($array as $cat => $conf) {
             $c = strtolower($cat);
-            foreach ($conf as $key=>$val) {
-                if ($c == 'core' && isset($this->$key)) {
-                    $this->$key=$val;
+            foreach ($conf as $k => $v) {
+                if ($c == 'core' && isset($this->$k)) {
+                    $this->$k=$v;
                 } else {
-                    $this->$c->$key = $val;
+                    if (!isset($this->$c)) {
+                        $this->$c = new stdClass;
+                    }
+                    $this->$c->$k = $v;
                 }
             }
         }
     }
 
+    function read_config()
+    {
+        $this->read_ini_file($this->spoolroot.'/configs/platal.ini');
+
+        $this->read_ini_file($this->spoolroot.'/configs/platal.conf');
+    }
+
     function dbconnect()
     {
         @mysql_connect($this->dbhost, $this->dbuser, $this->dbpwd);
@@ -86,10 +89,9 @@ class PlatalGlobals
 
     function setlocale()
     {
-        global $globals;
-        setlocale(LC_MESSAGES, $globals->core->locale);
-        setlocale(LC_TIME,     $globals->core->locale);
-        setlocale(LC_CTYPE,    $globals->core->locale);
+        setlocale(LC_MESSAGES, $this->locale);
+        setlocale(LC_TIME,     $this->locale);
+        setlocale(LC_CTYPE,    $this->locale);
     }
 
     function asso($key=null)