Changeset 19 for Zend

Timestamp:

06/21/06 14:09:13 (3 years ago)

Author:

richard

Message:

Group functionality added

Files:

• Zend/Perms.php (modified) (6 diffs)

Zend/Perms.php

@@ -10 +10 @@
   private static $_gmp = NULL;
 
-        private static $_callback;
+  private static $_group_callback;
+
+        private static $_perm_callback;
         /**
          * Stores the permissions array
@@ -19 +21 @@
          */
         private static $_perm_array;
+
+  /**
+   * Stores group permissions in an array
+   * $array['Admin'][] = 1;
+   * $array['Admin'][] = 2;
+   * $array['Admin'][] = 4;
+   * $array['Admin'][] = 8;
+   */
+  private static $_group_array;
+
         /**
          * Holds a reference to the variable to verify againsts
@@ -29 +41 @@
          * would only work AFTER start session has been called
          */
-        public static function initPerms(&$user_value, $callback = NULL, $gmpoverride = 1) {
+        public static function initPerms(&$user_value, $perm_callback = NULL, $group_callback = NULL, $gmpoverride = 1) {
                 self::$_user_value = &$user_value;
-    self::$_callback = $callback;
+    self::$_perm_callback = $perm_callback;
+    self::$_group_callback = $group_callback;
     if(function_exists('gmp_add') AND $gmpoverride) {
       self::$_gmp = 1;
@@ -41 +54 @@
          */
         public static function permCheck($value) {
-                if(!isset(self::$_perm_array) AND self::$_callback) {
-                        self::loadCallback(self::$_callback);
+                if(!isset(self::$_perm_array) AND self::$_perm_callback) {
+                        self::loadCallback(self::$_perm_callback);
                 }
                 if(!isset(self::$_perm_array)) {
@@ -61 +74 @@
                  * Single value, go ahead and check, return true if success
                  */
-                } elseif(isset(self::$_perm_array[$value]) AND (self::bit_and(self::$_perm_array[$value], self::$_user_value))) {
+                } elseif(isset(self::$_perm_array[$value]) AND (self::bitAnd(self::$_perm_array[$value], self::$_user_value))) {
                         return true;
                 }
                 return false;
         }
+
+  public static function groupCheck($group) {
+    if(!isset(self::$_group_array) AND self::$_group_callback) {
+      self::loadCallback(self::$_group_callback);
+    }
+    if(!isset(self::$_group_array)) {
+      throw new Zend_Perms_Exception('No group permissions have been loaded');
+    }
+    if(!isset(self::$_group_array[$group])) {
+      return false;
+    }
+    foreach(self::$_group_array[$group] as $key) {
+      if(!bitAnd($key, self::$_user_value)) {
+        return false;
+      }
+    }
+  }
 
   /**
@@ -86 +116 @@
 
         /**
-         * Loads the verification array from a database
+         * Loads the permissions from a callback function
          */
-        private static function loadCallback($callback) {
+        private static function loadCallback($callback, $group = 0) {
     if(is_callable($callback)) {
-      call_user_func($callback);
+      if($group) {
+        self::$_group_array = call_user_func($callback);
+      } else {
+        self::$_perm_array = call_user_func($callback);
+      }
     } else {
-      throw new Zend_Config_Exception('Callback function is not available');
+      throw new Zend_Config_Exception('Permissions Callback function is not available');
     }
         }