X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplatal.php;h=e72fc0bf8c98877e71af0ec4905db2e14c570a22;hb=eccc8fa784f19c658862f57ff634cce331e0b40a;hp=686d83dbab9599191b9a0a5d5fa949758ce1e653;hpb=02838718a24585bf72f3e4c26a8e4f1d19817dc9;p=platal.git

diff --git a/classes/platal.php b/classes/platal.php
index 686d83d..e72fc0b 100644
--- a/classes/platal.php
+++ b/classes/platal.php
@@ -181,23 +181,7 @@ class Platal
             return true;
         }
         $s_perms = S::v('perms');
-
-        // hook perms syntax is
-        $perms = explode(',', $perms);
-        foreach ($perms as $perm)
-        {
-            $ok = true;
-            $rights = explode(':', $perm);
-            foreach ($rights as $right) {
-                if (($right{0} == '!' && $s_perms->hasFlag(substr($right, 1))) || !$s_perms->hasFlag($right)) {
-                    $ok = false;
-                }
-            }
-            if ($ok) {
-                return true;
-            }
-        }
-        return false;
+        return $s_perms->hasFlagCombination($perms);
     }
 
     private function call_hook(PlatalPage &$page)
@@ -237,7 +221,7 @@ class Platal
         return $val;
     }
 
-    protected function force_login(PlatalPage &$page)
+    public function force_login(PlatalPage &$page)
     {
         if (S::logged()) {
             $page->changeTpl('core/password_prompt_logged.tpl');