Changeset 2451

Timestamp:

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

Author:

bjohnson

Message:

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

Location:

branches/schema06/system

Files:

• admin/groups.php (modified) (1 diff)
• classes/acl.php (modified) (5 diffs)
• classes/adminhandler.php (modified) (2 diffs)
• classes/databaseconnection.php (modified) (2 diffs)
• classes/post.php (modified) (2 diffs)
• classes/user.php (modified) (1 diff)
• classes/usergroup.php (modified) (1 diff)

branches/schema06/system/admin/groups.php

@@ -54 +54 @@
         echo '<form method="post" action="">';
         echo '<input type="hidden" name="group" value="' . $group_edit->name . '">';
-        echo '<table><tr><th>' . _t('Granted') . '</th><th>' . _t('Permission') . '</th><th>' . _t('Denied') . '</th></tr>';
+        echo '<table><tr><th>' . _t('Permission') . '</th><th>' . _t('Denied') . '</th><th>' . _t('Read') . '</th><th>' . _t('Write') . '</th><th>' . _t('Full') . '</th></tr>';
         foreach( $permissions as $perm ) {
-            echo '<tr>';
-            if(  isset( $permissions_granted[ $perm->id ] ) ) {
-                // indicate that this permission is granted
-            } elseif ( isset( $permissions_denied[ $perm->id ] ) ) {
-                // indicate that this permission is denied
+            echo "<tr><td> {$perm->description} </td>";
+            foreach ( ACL::permission_ids() as $access_name => $access_id ) {
+                echo "<td><input type='checkbox' name='perm_{$perm->id}' value='{$access_name}'";
+                if ( isset( $permissions_granted[$perm->id] ) && $permissions_granted[$perm->id] == $access_id ) {
+                    echo ' checked';
+                }
+                echo "></td><td>";
             }
-            echo "<td><input type='checkbox' name='grant[]' value='{$perm->id}'";
-            if ( in_array( $perm->id, $permissions_granted ) ) {
-                echo ' checked';
-            }
-            echo "></td><td> {$perm->description} </td><td>";
-            echo "<input type='checkbox' name='deny[]' value='{$perm->id}'";
-            if ( in_array( $perm->id, $permissions_denied ) ) {
-                echo ' checked';
-            }
-            echo '></td></tr>';
         }
         echo '<tr><td colspan="3"><input type="submit" name="permissions" value="' . _t('Submit') . '"></td>';

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;
         }

branches/schema06/system/classes/adminhandler.php

@@ -1902 +1902 @@
                 $this->theme->users= Users::get_all();
                 $this->theme->permissions= ACL::all_permissions( 'description' );
-                $this->theme->permissions_granted= $group->granted;
-                $this->theme->permissions_denied= $group->denied;
+                $this->theme->permissions_granted= $group->permissions;
             }
         }
@@ -1948 +1947 @@
             else {
                 $grant= array();
-                $deny= array();
                 $revoke= array();
-                if ( isset( $this->handler_vars['grant'] ) ) {
-                    $form_grant= $this->handler_vars['grant'];
-                }
-                else {
-                    $form_grant= array();
-                }
-                if ( isset( $this->handler_vars['deny'] ) ) {
-                    $form_deny= $this->handler_vars['deny'];
-                }
-                else {
-                    $form_deny= array();
-                }
                 $group= UserGroup::get( $group_name );
+
                 foreach( ACL::all_permissions() as $permission ) {
-                    if ( in_array( $permission->id, $form_grant ) ) {
-                        $grant[]= (int) $permission->id;
+                    // grab the type of access for each permission
+                    if ( isset( $this->handler_vars['perm' + $permission->id] ) ) {
+                        $grant[$permission->id] = $this->handler_vars['perm' + $permission->id];
                     }
-                    elseif ( in_array( $permission->id, $form_deny ) ) {
-                        $deny[]= (int) $permission->id;
+                    // if it isn't set, then revoke it
+                    else {
+                        $revoke[] = (int) $permission->id;
                     }
-                    else {
-                        $revoke[]= (int) $permission->id;
-                    }
-                }
-                if ( ! empty( $grant ) ){
+                }
+                if ( ! empty( $grant ) ) {
+                    /* the following call does not yet work as used
+                     * need to re-write UserGroup::grant() */
                     $group->grant( $grant );
-                }
-                if ( ! empty( $deny ) ) {
-                    $group->deny( $deny );
                 }
                 if ( ! empty( $revoke ) ) {

branches/schema06/system/classes/databaseconnection.php

@@ -26 +26 @@
         'crontab',
         'groups',
-        'groups_permissions',
+        'group_token_permissions',
         'log',
         'log_types',
+        'object_terms',
+        'object_types',
         'options',
         'permissions',
+        'post_tokens',
         'postinfo',
         'posts',
@@ -39 +42 @@
         'tag2post',
         'tags',
+        'terms',
+        'tokens',
         'userinfo',
         'users',
+        'user_token_permissions',
         'users_groups',
+        'vocabularies',
     );
 

branches/schema06/system/classes/post.php

@@ -1006 +1006 @@
     {
         $token_id = ACL::token_id( $permission );
-        if ( $token_id !== FALSE ) {
+        if ( isset( $token_id ) ) {
             DB::insert( '{post_tokens}', array( 'post_id' => $this->id, 'token_id' => $token_id ) );
         }
@@ -1016 +1016 @@
     public function delete_permissions()
     {
-        DB::delete( '{post_tokens}', array( 'post_id', => $this->id ) );
+        DB::delete( '{post_tokens}', array( 'post_id' => $this->id ) );
     }
 }

branches/schema06/system/classes/user.php

@@ -406 +406 @@
 
     /**
+     * Assign one or more new permissions to this user
+     * @param mixed A permission token ID, name, or array of the same
+    **/
+    public function grant( $permissions, $access = 'full' )
+    {
+        $permissions = Utils::single_array( $permissions );
+        // Use ids internally for all permissions
+        $permissions = array_map(array('ACL', 'token_id'), $permissions);
+
+        foreach ( $permissions as $permission ) {
+            ACL::grant_user( $this->id, $permission, $access );
+        }
+    }
+
+    /**
+     * Deny one or more permissions to this user
+     * @param mixed The permission ID or name to be denied, or an array of the same
+    **/
+    public function deny( $permissions )
+    {
+        $this->grant( $permissions, 'deny' );
+    }
+
+    /**
+     * Remove one or more permissions from a user
+     * @param mixed a permission ID, name, or array of the same
+    **/
+    public function revoke( $permissions )
+    {
+        $permissions = Utils::single_array( $permissions );
+        // get token IDs
+        $permissions = array_map(array('ACL', 'token_id'), $permissions);
+        foreach ( $permissions as $permission ) {
+            ACL::revoke_user_permission( $this->id, $permission );
+        }
+    }
+
+    /**
      * function groups
      * Returns an array of groups to which this user belongs

branches/schema06/system/classes/usergroup.php

@@ -235 +235 @@
     {
         $permissions = Utils::single_array( $permissions );
+        $permissions = array_map(array('ACL', 'token_id'), $permissions);
         // Remove permissions from the granted list
         $this->permissions = array_diff_key( $this->permissions, $permissions );