Merge commit 'origin' into platal-0.9.15

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

diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in
index fa8646a..9bb1b54 100644 (file)
--- a/include/globals.inc.php.in
+++ b/include/globals.inc.php.in
@@ -26,6 +26,9 @@ class PlatalGlobals
     /** The x.org version */
     public $version = '@VERSION@';
     public $debug   = 0;
+    public $mode    = 'rw';    // 'rw' => read/write,
+                               // 'r'  => read/only
+                               // ''   => site down
 
     /** db params */
     public $dbdb               = 'x4dat';
@@ -34,6 +37,10 @@ class PlatalGlobals
     public $dbpwd              = 'x4dat';
     public $dbcharset          = 'utf8';
 
+    /** default skin */
+    public $skin;
+    public $register_skin;
+
     /** paths */
     public $baseurl;
     public $spoolroot;
@@ -46,7 +53,7 @@ class PlatalGlobals
         $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();
@@ -86,6 +93,7 @@ class PlatalGlobals
         setlocale(LC_TIME,     $this->locale);
         setlocale(LC_CTYPE,    $this->locale);
         date_default_timezone_set($this->timezone);
+        mb_internal_encoding("UTF-8");
     }
 
     public function asso($key=null)
@@ -99,7 +107,7 @@ class PlatalGlobals
             }
 
             if ($gp) {
-                $res = XDB::query('SELECT  a.*, d.nom AS domnom
+                $res = XDB::query('SELECT  a.*, d.nom AS domnom, FIND_IN_SET(\'wiki_desc\', a.flags) AS wiki_desc
                                      FROM  groupex.asso AS a
                                 LEFT JOIN  groupex.dom  AS d ON d.id = a.dom
                                     WHERE  diminutif = {?}', $gp);