Changeset 2712

Timestamp:

07/15/05 01:24:08 (3 years ago)

Author:

ryan

Message:

Cap migration.

Files:

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

trunk/wp-includes/capabilities.php

@@ -103 +103 @@
-class WP_User {
-    var $data;
-
-
+ = 0
+ = array()
-    var $cap_key;
-
-
+ = array()
+ = array()
-
-    function WP_User($id) {
-        global $wp_roles, $table_prefix;
-
-
+
+
+
+
+
+
+
+
+
+
+
-        $this->cap_key = $table_prefix . 'capabilities';
-        $this->caps = &$this->data->{$this->cap_key};
@@ -141 +150 @@
-    
-    function remove_role($role) {
-
-
+
+
+
-        update_usermeta($this->id, $this->cap_key, $this->caps);
-        $this->get_role_caps();
@@ -178 +188 @@
-
-    function remove_cap($cap) {
-(!empty($this->roles[$role])
+ ( empty($this->roles[$cap]) 
-        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 @@
-    }
-
-data->user_level >= 9
+->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) {
-
-
+
+
+
-            $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
-

trunk/xmlrpc.php

@@ -158 +158 @@
-      }
-
-_data = get_userdatabylogin
-_data->user_level > 3
+ = new WP_User
+->has_cap('level_8')
-
-      $struct = array(
@@ -296 +296 @@
-      }
-
-
-
-
-
+
+
+
-      }
-
@@ -332 +331 @@
-      }
-
-
-
-
-
+
+
+
-      }
-
@@ -850 +848 @@
-      } 
-
-if(get_settings('fileupload_minlevel') > $user_data->user_level) {
-  // User has not enough privileges
-Not enough privilege: user level too low
+$user = new WP_User($user_login);
+if ( !$user->has_cap('upload_files') ) {
+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;