Changeset 2848

Timestamp:

11/23/08 19:57:54 (7 weeks ago)

Author:

bjohnson

Message:

Add a user_tokens() method to the ACL class which will return all the token
IDs for which a given user has a specific permission type (read, write, etc).

Also fixing formatting in the bitmask class.

Location:

trunk/htdocs/system/classes

Files:

• acl.php (modified) (2 diffs)
• bitmask.php (modified) (2 diffs)

trunk/htdocs/system/classes/acl.php

@@ -32 +32 @@
     public static function __static()
     {
-        self::$access_ids = DB::get_keyvalue( 'SELECT name, id FROM {permissions};' );
+        /*self::$access_ids = DB::get_keyvalue( 'SELECT name, id FROM {permissions};' );
 
         if ( ! isset(self::$access_ids) ) {
             self::$access_ids = array();
         }
+        */
+        self::$access_ids = array( 0 => 'read', 1 => 'write', 2 => 'deny' );
         self::$access_names = array_flip( self::$access_ids );
     }
 
     /**
-     * Convert a permission access name (read, write, full, denied) into an ID
+     * Convert a permission access name (read, write, denied) into an ID
      * @param string The access name
      * @return mixed the ID of the permission, or boolean FALSE if it does not exist
@@ -351 +353 @@
 
     /**
+     * Get all the tokens for a given user with a particular kind of access
+     * @param mixed $user A user object, user ID or a username
+     * @param string $access Check for 'read', 'write', or 'full' access
+     * @return array of token IDs
+    **/
+    public static function user_tokens( $user, $access = 'write' )
+    {
+        // convert $user and $access to IDs
+        if ( is_numeric( $user ) ) {
+            $user_id = $user;
+        } else {
+            if ( ! $user instanceof User ) {
+                $user = User::get( $user );
+            }
+            $user_id = $user->id;
+        }
+        $access_id = self::access_id( $access );
+        
+        $tokens = DB::get_results( 'SELECT token_id FROM {user_token_permissions} WHERE user_id = ? AND permission_id = ?', array( $user_id, $access_id) );
+        return $tokens;
+    }
+
+    /**
      * Grant a permission to a group
      * @param integer $group_id The group ID

trunk/htdocs/system/classes/bitmask.php

@@ -4 +4 @@
  */
 class Bitmask {
-  public $flags = array();  // set of flag bit masks
-  protected $value = 0;        // internal integer value of the bitmask
+    public $flags = array();  // set of flag bit masks
+    protected $value = 0;        // internal integer value of the bitmask
 
-  /**
-   * Constructor.  Takes an optional array parameter
-   * of bit flags to mask on.
-   *
-   * @param array $flags An array of flag names
+    /**
+     * Constructor.  Takes an optional array parameter
+     * of bit flags to mask on.
+     *
+     * @param array $flags An array of flag names
      * @param integer $value (optional) a combined bitmask value
      */
-  public function __construct($flags = null, $value = null) {
-        if (! is_array($flags))
+    public function __construct( $flags = null, $value = null ) {
+        if ( ! is_array( $flags ) ) {
             throw new InvalidArgumentException(_t('Bitmask constructor expects either no arguments or an array as a first argument'));
+        }
 
         $this->flags = $flags;
-        if(!is_null($value)) {
+        if( ! is_null( $value ) ) {
             $this->value = $value;
         }
 
-  }
+    }
 
-  /**
-   * Magic setter method for flag values.
-   *
-   * @param bit   integer representing the mask bit
-   * @param on    on or off?
-   */
-  public function __set($bit, $on) {
-        switch($bit) {
+    /**
+     * Magic setter method for flag values.
+     *
+     * @param bit   integer representing the mask bit
+     * @param on    on or off?
+     */
+    public function __set( $bit, $on ) {
+        switch( $bit ) {
             case 'value':
                 $this->value = $on;
                 break;
             default:
-                if (! is_bool($flags))
+                if ( ! is_bool( $flags ) )
                     throw new InvalidArgumentException(_t('Bitmask values must be boolean'));
-                if( is_string($bit) ) {
-                    $bit = array_search($bit, $this->value);
+                if( is_string( $bit ) ) {
+                    $bit = array_search( $bit, $this->value );
                 }
-                if( !is_int($bit))
+                if( !is_int( $bit ) )
                     throw new InvalidArgumentException(_t('Bitmask names must be pre-defined strings or bitmask indexes'));
-                if($on) {
-                    $this->value |= pow(2, $bit);
+                if( $on ) {
+                    $this->value |= pow( 2, $bit );
                 }
                 else {
-                    $this->value &= ~pow(2, $bit);
+                    $this->value &= ~pow( 2, $bit );
                 }
                 break;
@@ -55 +56 @@
   }
 
-  /**
-   * Magic getter method for flag status
-   *
-   * @param bit   integer representing th emask bit to test
-   * @return boolean
-   */
-  public function __get($bit) {
-    if ( is_int($bit) ) {
-        $flags = array_values($this->flags);
-    }
+    /**
+     * Magic getter method for flag status
+     *
+     * @param bit   integer representing th emask bit to test
+     * @return boolean
+     */
+    public function __get( $bi t) {
+        if ( is_int( $bit ) ) {
+            $flags = array_values( $this->flags );
+        }
         else {
             $flags = $this->flags;
         }
-    if (!isset($flags[$bit]))
-      return false;
-    return (($this->value & $this->flags[$bit]) == $this->flags[$bit]);
-  }
+        if ( ! isset( $flags[$bit] ) ) {
+            return false;
+        }
+        return ( ( $this->value & $this->flags[$bit] ) == $this->flags[$bit] );
+    }
 
 }