Changeset 2458

Timestamp:

09/08/08 21:53:43 (4 months ago)

Author:

bjohnson

Message:

schema06: A bunch of fixes based on unit testing. A lot of tests still fail,
so there is more work to do here.

Location:

branches/schema06/system/classes

Files:

• acl.php (modified) (9 diffs)
• usergroup.php (modified) (6 diffs)

branches/schema06/system/classes/acl.php

@@ -32 +32 @@
     {
         self::$permission_ids = DB::get_keyvalue( 'SELECT name, id FROM {permissions};' );
-        if ( self::$permission_ids === FALSE ) {
+
+        if ( ! isset(self::$permission_ids) ) {
             self::$permission_ids = array();
         }
@@ -66 +67 @@
         $name= self::normalize_permission( $name );
         // first, make sure this isn't a duplicate
-        if ( ACL::permission_exists( $name ) ) {
+        if ( ACL::token_exists( $name ) ) {
             return false;
         }
@@ -161 +162 @@
     public static function token_id( $name )
     {
-        if( is_integer($name) ) {
+        if( is_numeric($name) ) {
             return $name;
         }
@@ -238 +239 @@
             group_id=? AND token_id=?;';
 
-        $result = DB::get_value( $sql );
-        if ( isset( $result ) && self::$permission_ids[$result] == $access ) {
+        $result = DB::get_value( $sql, array( $group, $permission) );
+        if ( isset( $result ) && $result == self::$permission_ids[$access] ) {
             // the permission has been granted to this group
             return true;
@@ -289 +290 @@
         $sql = <<<SQL
 SELECT permission_id
-FROM (
-(
-  SELECT permission_id
   FROM {user_token_permissions}
   WHERE user_id = :user_id
   AND token_id = :token_id
-) AS up
 UNION ALL
-(
-  SELECT gp.permission_id
+SELECT gp.permission_id
   FROM {users_groups} ug
   INNER JOIN {group_token_permissions} gp
   ON ug.group_id = gp.group_id
   AND ug.user_id = :user_id
-  AND gp.token_id = :token_id
-  ORDER BY permission_id ASC
-  LIMIT 1
-)
-)
-LIMIT 1; 
+  AND gp.token_id = :token_id;
 SQL;
         $result = DB::get_value( $sql, array( ':user_id' => $user_id, ':token_id' => $permission ) );
 
-        if ( isset( $result ) && self::$permission_ids[$result] == $access ) {
+        if ( isset( $result ) && $result == self::$permission_ids[$access] ) {
             return true;
         }
@@ -332 +323 @@
         // DB::update will insert if the token is not already in the group tokens table
         $result = DB::update(
-            '{group_tokens_permissions}',
+            '{group_token_permissions}',
             array( 'permission_id' => self::$permission_ids[$access] ),
             array( 'group_id' => $group_id, 'token_id' => self::token_id( $token_id ) )
         );
+
+        $ug = UserGroup::get_by_id( $group_id );
+        $ug->clear_permissions_cache();
 
         return $result;
@@ -350 +344 @@
     {
         $result = DB::update(
-            '{user_tokens_permissions}',
+            '{user_token_permissions}',
             array( 'permission_id' => self::$permission_ids[$access] ),
             array( 'user_id' => $user_id, 'token_id' => self::token_id( $token_id ) )
@@ -388 +382 @@
     public static function revoke_group_permission( $group_id, $token_id )
     {
-        $result = DB::delete( '{group_tokens_permissions}',
+        $result = DB::delete( '{group_token_permissions}',
             array( 'group_id' => $group_id, 'token_id' => $token_id ) );
+
+        $ug = UserGroup::get_by_id( $group_id );
+        $ug->clear_permissions_cache();
 
         return $result;
@@ -402 +399 @@
     public static function revoke_user_permission( $user_id, $token_id )
     {
-        $result = DB::delete( '{user_tokens_permissions}',
+        $result = DB::delete( '{user_token_permissions}',
             array( 'user_id' => $user_id, 'token_id' => $token_id ) );
 

branches/schema06/system/classes/usergroup.php

@@ -40 +40 @@
                 $this->member_ids= $result;
             }
-
-            if ( $results= DB::get_results( 'SELECT token_id, permission_id FROM {group_token_permissions} WHERE group_id=?', array( $this->id ) ) ) {
-                foreach ( $results as $result ) {
-                    $this->permissions[$result->token_id] = $result->permission_id;
-                }
-            }
         }
 
@@ -212 +206 @@
         $permissions = array_map(array('ACL', 'token_id'), $permissions);
 
-        // Merge and grant the new permissions
+        // grant the new permissions
         foreach ( $permissions as $permission ) {
-            $this->permissions[$permission] = $access;
             ACL::grant_group( $this->id, $permission, $access );
         }
@@ -236 +229 @@
         $permissions = Utils::single_array( $permissions );
         $permissions = array_map(array('ACL', 'token_id'), $permissions);
+        if ( ! isset( $this->permissions ) ) {
+            $this->load_permissions_cache();
+        }
         // Remove permissions from the granted list
         $this->permissions = array_diff_key( $this->permissions, $permissions );
@@ -254 +250 @@
     {
         $permission= ACL::token_id( $permission );
+        if ( ! isset( $this->permissions ) ) {
+            $this->load_permissions_cache();
+        }
         if ( isset( $this->permissions[$permission] ) && $this->permissions[$permission] == $access ) {
             return true;
         }
         return false;
+    }
+    
+    /**
+     * Clear permissions cache.
+     */
+    public function clear_permissions_cache()
+    {
+        unset( $this->permissions );
+    }
+    
+    /**
+     * Load permissions cache.
+     */
+    public function load_permissions_cache()
+    {
+        if ( $results= DB::get_results( 'SELECT token_id, permission_id FROM {group_token_permissions} WHERE group_id=?', array( $this->id ) ) ) {
+            foreach ( $results as $result ) {
+                $this->permissions[$result->token_id] = $result->permission_id;
+            }
+        }
     }
 
@@ -313 +332 @@
     public static function name( $id )
     {
-        $check_field = is_int( $id ) ? 'id' : 'name';
+        $check_field = is_numeric( $id ) ? 'id' : 'name';
         $name = DB::get_value( "SELECT name FROM {groups} WHERE {$check_field}=?", array( $id ) );
         return $name;  // get_value returns false if no record is returned
@@ -325 +344 @@
     public static function id( $name )
     {
-        $check_field = is_int( $name ) ? 'id' : 'name';
-        $id = DB::get_value( "SELECT id FROM {groups} WHERE {$check_field}=?", array( $name ) );
+        if( is_numeric($name) ) {
+            return $name;
+        }
+        $id = DB::get_value( "SELECT id FROM {groups} WHERE name=?", array( $name ) );
         return $id; // get_value returns false if no record is returned
     }