Changeset 2859

Timestamp:

11/24/08 03:10:34 (7 weeks ago)

Author:

bjohnson

Message:

Fixing bugs in ACL and Bitmask classes such that we now pass the ACL tests again.

Location:

trunk/htdocs/system/classes

Files:

• acl.php (modified) (3 diffs)
• bitmask.php (modified) (1 diff)

trunk/htdocs/system/classes/acl.php

@@ -29 +29 @@
      * Check the permission bitmask for a particular access type.
      * @param mixed $permission The permission bitmask
-     * @param mixed $access The name of the access to check against (read, write, delete)
+     * @param mixed $access The name of the access to check against (read, write, full)
      * @return bool Returns true if the given access meets exceeds the access to check against
      */
-    public static function access_check( $permission_flag, $access )
+    public static function access_check( $permission, $access )
     {       
         $bitmask = new Bitmask( self::$access_names, $permission );
         
+        if ( $access == 'full' ) {
+            return $bitmask->read && $bitmask->write;
+        }
         return $bitmask->$access;
     }
@@ -277 +280 @@
   AND ug.user_id = :user_id
   AND gp.token_id = :token_id
-  ORDER BY gp.permission_id
+  ORDER BY permission_id ASC
   LIMIT 1;
 SQL;
@@ -376 +379 @@
     public static function grant_user( $user_id, $token_id, $access = 'full' )
     {
-        $permission_id = DB::get_value( 'SELECT permission_id FROM {user_token_permissions} WHERE group_id=? AND token_id=?',
+        $permission_id = DB::get_value( 'SELECT permission_id FROM {user_token_permissions} WHERE user_id=? AND token_id=?',
             array( $user_id, $token_id ) );
         if ( $permission_id ===  false ) {

trunk/htdocs/system/classes/bitmask.php

@@ -64 +64 @@
      */
     public function __get( $bit ) {
-        if ( is_int( $bit ) ) {
-            $flags = array_values( $this->flags );
+        if ( is_string( $bit ) ) {
+            $bit = array_search( $bit, $this->flags );
         }
-        else {
-            $flags = $this->flags;
-        }
-        if ( ! isset( $flags[$bit] ) ) {
+        if ( $bit === false )
             return false;
-        }
-        return ( ( $this->value & $this->flags[$bit] ) == $this->flags[$bit] );
+        return $this->value & pow(2, $bit);
     }
 
 }
 ?>
+