Petit probleme de decompte : si n personnes en tout viennent (donc moi compris),...

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

diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in
index b3fc66f..5e32b42 100644 (file)
--- a/include/globals.inc.php.in
+++ b/include/globals.inc.php.in
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -38,6 +38,7 @@ class PlatalGlobals
     var $spoolroot;
 
     var $locale;
+    var $timezone;
 
     function PlatalGlobals($sess)
     {
@@ -62,7 +63,7 @@ class PlatalGlobals
         foreach ($array as $cat => $conf) {
             $c = strtolower($cat);
             foreach ($conf as $k => $v) {
-                if ($c == 'core' && isset($this->$k)) {
+                if ($c == 'core' && property_exists($this, $k)) {
                     $this->$k=$v;
                 } else {
                     if (!isset($this->$c)) {
@@ -92,6 +93,7 @@ class PlatalGlobals
         setlocale(LC_MESSAGES, $this->locale);
         setlocale(LC_TIME,     $this->locale);
         setlocale(LC_CTYPE,    $this->locale);
+        date_default_timezone_set($this->timezone);
     }
 
     function asso($key=null)
@@ -100,7 +102,9 @@ class PlatalGlobals
 
         if (is_null($aid)) {
             $gp = Get::v('n');
-            $gp = substr($gp, 0, strpos($gp, '/'));
+            if ($p = strpos($gp, '/')) {
+                $gp = substr($gp, 0, $p);
+            }
 
             if ($gp) {
                 $res = XDB::query('SELECT  a.*, d.nom AS domnom