Backport 1745-1747

[platal.git] / classes / session.php

diff --git a/classes/session.php b/classes/session.php
index 2ebaac2..28a02d2 100644 (file)
--- a/classes/session.php
+++ b/classes/session.php
@@ -19,9 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-global $lc_accent, $lc_plain, $uc_accent, $uc_plain;
-require_once 'diogenes/diogenes.misc.inc.php';
-
 class Session
 {
     public static function init()
@@ -30,6 +27,9 @@ class Session
         if (empty($_SESSION['challenge'])) {
             $_SESSION['challenge'] = sha1(uniqid(rand(), true));
         }
+        if (!isset($_SESSION['perms']) || !($_SESSION['perms'] instanceof FlagSet)) {
+            $_SESSION['perms'] = new FlagSet();
+        }
     }
 
     public static function destroy()
@@ -61,7 +61,7 @@ class Session
 
     public static function has_perms()
     {
-        return Session::logged() && Session::v('perms') == PERMS_ADMIN;
+        return Session::logged() && Session::v('perms')->hasFlag(PERMS_ADMIN);
     }
 
     public static function logged()