Changeset 2451 for branches/schema06/system/classes/acl.php

Timestamp:

09/06/08 21:46:19 (4 months ago)

Author:

bjohnson

Message:

schema06: Fixing a bunch of syntax errors in recent commits. Habari
successfully installs now.

Files:

• branches/schema06/system/classes/acl.php (modified) (5 diffs)

branches/schema06/system/classes/acl.php

@@ -31 +31 @@
     public static function __static()
     {
-        $result = DB::get_results( 'SELECT id, name FROM {permissions};' );
-        foreach ( $result as $r ) {
-            self::$permission_ids[$r->name] = $r->id;
+        self::$permission_ids = DB::get_keyvalue( 'SELECT name, id FROM {permissions};' );
+        if ( self::$permission_ids === FALSE ) {
+            self::$permission_ids = array();
         }
     }
@@ -44 +44 @@
     public static function permission_id( $name )
     {
-        return ( isset( self::$permission_ids[$name] ) ? self::$permission_ids[$name] : FALSE;
+        return isset( self::$permission_ids[$name] ) ? self::$permission_ids[$name] : FALSE;
+    }
+    
+    /**
+     * Return all possible access names
+     * @return array An associative array of access names and ids
+     */
+    public static function permission_ids()
+    {
+        return self::$$permission_ids;
     }
 
@@ -230 +239 @@
 
         $result = DB::get_value( $sql );
-        if ( $result !== FALSE && self::$permission_ids[$result] == $access ) {
+        if ( isset( $result ) && self::$permission_ids[$result] == $access ) {
             // the permission has been granted to this group
             return true;
@@ -249 +258 @@
     {
         // Use only numeric ids internally
-        $permission= self::token_id( $permission );
+        $permission = self::token_id( $permission );
         // if we were given a user ID, use that to fetch the group membership from the DB
         if ( is_int( $user) ) {
@@ -301 +310 @@
 LIMIT 1; 
 SQL;
-        $result = DB::get_value( $sql, array( ':user_id' => $user_id, ':token_id' => $permission );
-
-        if ( $result !== FALSE && self::permission_ids[$result] == $access ) {
+        $result = DB::get_value( $sql, array( ':user_id' => $user_id, ':token_id' => $permission ) );
+
+        if ( isset( $result ) && self::$permission_ids[$result] == $access ) {
             return true;
         }