Changeset 2864

Timestamp:

11/24/08 04:54:57 (7 weeks ago)

Author:

ringmaster

Message:

Add special permission cases 'full' and 'any'. Default User::can() to 'any'. Make Bitmasks return a full bitmask for ->full

Location:

trunk/htdocs/system/classes

Files:

• acl.php (modified) (1 diff)
• bitmask.php (modified) (2 diffs)
• user.php (modified) (1 diff)

trunk/htdocs/system/classes/acl.php

@@ -36 +36 @@
         $bitmask = new Bitmask( self::$access_names, $permission );
 
-        if ( $access == 'full' ) {
-            return $bitmask->read && $bitmask->write;
-        }
-        return $bitmask->$access;
+        switch($access) {
+            case 'full':
+                return $bitmask->value == $bitmask->full;
+            case 'any':
+                return $bitmask->value != 0;
+            default:
+                return $bitmask->$access;
+        }
     }
 

trunk/htdocs/system/classes/bitmask.php

@@ -68 +68 @@
     {
         if ( is_string( $bit ) ) {
-            $bit = array_search( $bit, $this->flags );
+            if($bit == 'full') {
+                return (1 << (count($this->flags) - 1)) - 1;
+            }
+            else {
+                $bit = array_search( $bit, $this->flags );
+            }
         }
         if ( $bit === false )
@@ -77 +82 @@
 }
 ?>
-

trunk/htdocs/system/classes/user.php

@@ -411 +411 @@
      * @return boolean True if this user has the requested permission, false if not
      */
-    public function can( $permission, $access = 'full' )
+    public function can( $permission, $access = 'any' )
     {
         return ACL::user_can( $this, $permission, $access );