Changeset 2712

Timestamp:

07/15/2005 01:24:08 AM (20 years ago)

Author:

ryan

Message:

Cap migration.

Location:

trunk

Files:

• wp-includes/capabilities.php (modified) (3 diffs)
• wp-includes/functions-post.php (modified) (2 diffs)
• wp-includes/registration-functions.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)
• xmlrpc.php (modified) (4 diffs)

trunk/wp-includes/capabilities.php

@@ -103 +103 @@
 class WP_User {
     var $data;
-    var $id;
-    var $caps;
+    var $id = 0;
+    var $caps = array();
     var $cap_key;
-    var $roles;
-    var $allcaps;
+    var $roles = array();
+    var $allcaps = array();
 
     function WP_User($id) {
         global $wp_roles, $table_prefix;
-        $this->id = $id;
-        $this->data = get_userdata($id);
+
+        if ( is_numeric($id) ) {
+            $this->data = get_userdata($id);
+        } else {
+            $this->data = get_userdatabylogin($id);
+        }
+
+        if ( empty($this->data->ID) )
+            return;
+
+        $this->id = $this->data->ID;
         $this->cap_key = $table_prefix . 'capabilities';
         $this->caps = &$this->data->{$this->cap_key};
@@ -141 +150 @@
     
     function remove_role($role) {
-        if(!empty($this->roles[$role]) && (count($this->roles) > 1))
-        unset($this->caps[$cap]);
+        if ( empty($this->roles[$role]) || (count($this->roles) <= 1) )
+            return;
+        unset($this->caps[$role]);
         update_usermeta($this->id, $this->cap_key, $this->caps);
         $this->get_role_caps();
@@ -178 +188 @@
 
     function remove_cap($cap) {
-        if(!empty($this->roles[$role])) return;
+        if ( empty($this->roles[$cap]) ) return;
         unset($this->caps[$cap]);
         update_usermeta($this->id, $this->cap_key, $this->caps);

trunk/wp-includes/functions-post.php

@@ -533 +533 @@
     if ( $user_id ) {
         $userdata = get_userdata($user_id);
+        $user = new WP_User($user_id);
         $post_author = $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = '$comment_post_ID' LIMIT 1");
     }
@@ -553 +554 @@
     }
 
-    if ( $userdata && ( $user_id == $post_author || $userdata->user_level >= 9 ) ) {
+    if ( $userdata && ( $user_id == $post_author || $user->has_cap('level_9') ) ) {
         $approved = 1;
     } else {

trunk/wp-includes/registration-functions.php

@@ -27 +27 @@
     $user_level = (int) $user_level;
     update_usermeta( $user_id, $wpdb->prefix . 'user_level', $user_level);
+    $user = new WP_User($user_id);
+    $user->set_role(get_settings('default_role'));
+    
     return $user_id;
 }

trunk/wp-login.php

@@ -177 +177 @@
 
     if ($user_login && $user_pass) {
-        $user = get_userdatabylogin($user_login);
-        if ( 0 == $user->user_level )
+        $user = new WP_User($user_login);
+        // If the user can't edit posts, send them to their profile.
+        if ( ! $user->has_cap('edit_posts') )
             $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
 

trunk/xmlrpc.php

@@ -158 +158 @@
       }
 
-      $user_data = get_userdatabylogin($user_login);
-      $is_admin = $user_data->user_level > 3;
+      $user = new WP_User($user_login);
+      $is_admin = $user->has_cap('level_8');
 
       $struct = array(
@@ -296 +296 @@
       }
 
-      $user_data = get_userdatabylogin($user_login);
-
-      if ($user_data->user_level < 3) {
-        return new IXR_Error(401, 'Sorry, users whose level is less than 3, can not edit the template.');
+      $user = new WP_User($user_login);
+      if ( !$user->has_cap('edit_themes') ) {
+        return new IXR_Error(401, 'Sorry, this user can not edit the template.');
       }
 
@@ -332 +331 @@
       }
 
-      $user_data = get_userdatabylogin($user_login);
-
-      if ($user_data->user_level < 3) {
-        return new IXR_Error(401, 'Sorry, users whose level is less than 3, can not edit the template.');
+      $user = new WP_User($user_login);
+      if ( !$user->has_cap('edit_themes') ) {
+        return new IXR_Error(401, 'Sorry, this user can not edit the template.');
       }
 
@@ -850 +848 @@
       } 
 
-      if(get_settings('fileupload_minlevel') > $user_data->user_level) {
-        // User has not enough privileges
-        logIO('O', '(MW) Not enough privilege: user level too low');
+      $user = new WP_User($user_login);
+      if ( !$user->has_cap('upload_files') ) {
+        logIO('O', '(MW) User does not have upload_files capability');
         $this->error = new IXR_Error(401, 'You are not allowed to upload files to this site.');
         return $this->error;