Wiki allow [[~alias]] ==> Prenom NOM Xxxxx (aka Surnom)

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

diff --git a/include/platal/globals.inc.php.in b/include/platal/globals.inc.php.in
index ff7b9c0..660176e 100644 (file)
--- a/include/platal/globals.inc.php.in
+++ b/include/platal/globals.inc.php.in
@@ -19,23 +19,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-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
-
 class CoreConfig
 {
     var $locale = 'fr_FR';
 }
 
-// }}}
-
-// {{{ class XorgGlobals
-
-class PlatalGlobals extends DiogenesCoreGlobals
+class PlatalGlobals
 {
     var $page    = 'XorgPage';
     var $session;
@@ -52,11 +41,13 @@ class PlatalGlobals extends DiogenesCoreGlobals
     var $dbuser             = 'x4dat';
     var $dbpwd              = 'x4dat';
 
-    var $table_auth         = 'auth_user_md5';
     var $table_log_actions  = 'logger.actions';
     var $table_log_sessions = 'logger.sessions';
     var $table_log_events   = 'logger.events';
 
+    /** The class to use for session handling. */
+    var $session = 'DiogenesCoreSession';
+
     /** logger */
     var $tauth  = array('native'=>'auth_user_md5');
     var $tlabel = array('native'=>'X.Org');
@@ -74,8 +65,22 @@ class PlatalGlobals extends DiogenesCoreGlobals
         $this->spoolroot = dirname(dirname(dirname(__FILE__)));
     }
 
+    function dbconnect()
+    {
+        @mysql_connect($this->dbhost, $this->dbuser, $this->dbpwd);
+        @mysql_select_db($this->dbdb);
+    }
+
     function read_config()
     {
+        $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;
@@ -102,7 +107,5 @@ class PlatalGlobals extends DiogenesCoreGlobals
     }
 }
 
-// }}}
-
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>