X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fglobals.inc.php.in;h=6ad5a3c5e2da82c8125c8b477384a993493f1473;hb=259626014d09f53dd6993724a6b0f38bb8af8b86;hp=0554899353adb27785a2c751f4d1b447923aead7;hpb=32d9ae72ae511acf33d9d0606bba0c347e8d37f0;p=platal.git

diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in
index 0554899..6ad5a3c 100644
--- a/include/globals.inc.php.in
+++ b/include/globals.inc.php.in
@@ -21,41 +21,43 @@
 
 class PlatalGlobals
 {
-    var $session;
+    public $session;
 
     /** The x.org version */
-    var $version = '@VERSION@';
-    var $debug   = 0;
+    public $version = '@VERSION@';
+    public $debug   = 0;
 
     /** db params */
-    var $dbdb               = 'x4dat';
-    var $dbhost             = 'localhost';
-    var $dbuser             = 'x4dat';
-    var $dbpwd              = 'x4dat';
+    public $dbdb               = 'x4dat';
+    public $dbhost             = 'localhost';
+    public $dbuser             = 'x4dat';
+    public $dbpwd              = 'x4dat';
+    public $dbcharset          = 'utf8';
+
+    /** default skin */
+    public $skin;
+    public $register_skin;
 
     /** paths */
-    var $baseurl;
-    var $spoolroot;
+    public $baseurl;
+    public $spoolroot;
 
-    var $locale;
-    var $timezone;
+    public $locale;
+    public $timezone;
 
-    function PlatalGlobals($sess)
+    public function __construct($sess)
     {
         $this->session   = $sess;
 
         $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->spoolroot = dirname(dirname(__FILE__));
 
         $this->read_config();
         $this->setlocale();
-
-        require_once dirname(__FILE__) . '/../classes/xdb.php';
-        XDB::connect($this->dbhost, $this->dbuser, $this->dbpwd, $this->dbdb, 'utf8', $this->debug);
     }
 
-    function read_ini_file($filename)
+    private function read_ini_file($filename)
     {
         $array = parse_ini_file($filename, true);
         if (!is_array($array)) {
@@ -76,22 +78,22 @@ class PlatalGlobals
         }
     }
 
-    function read_config()
+    private function read_config()
     {
         $this->read_ini_file($this->spoolroot.'/configs/platal.ini');
-
         $this->read_ini_file($this->spoolroot.'/configs/platal.conf');
     }
 
-    function setlocale()
+    private function setlocale()
     {
         setlocale(LC_MESSAGES, $this->locale);
         setlocale(LC_TIME,     $this->locale);
         setlocale(LC_CTYPE,    $this->locale);
         date_default_timezone_set($this->timezone);
+        mb_internal_encoding("UTF-8");
     }
 
-    function asso($key=null)
+    public function asso($key=null)
     {
         static $aid = null;