Changeset 2703

Timestamp:

07/11/2005 10:39:50 PM (20 years ago)

Author:

ryan

Message:

Role/capability system. Round one. Props: Owen Winkler

Location:

trunk

Files:

• wp-admin/post.php (modified) (1 diff)
• wp-admin/upgrade-functions.php (modified) (2 diffs)
• wp-admin/upgrade-schema.php (modified) (2 diffs)
• wp-includes/capabilities.php (added)
• wp-includes/functions.php (modified) (3 diffs)
• wp-includes/pluggable-functions.php (modified) (3 diffs)
• wp-settings.php (modified) (3 diffs)

trunk/wp-admin/post.php

@@ -67 +67 @@
     $post_ID = $p = (int) $_GET['post'];
 
-    if ( !user_can_edit_post($user_ID, $post_ID) )
+    if ( !current_user_can('edit_post', $post_ID) )
         die ( __('You are not allowed to edit this post.') );
 

trunk/wp-admin/upgrade-functions.php

@@ -227 +227 @@
         if ( !empty( $user->user_nickname ) )
             update_usermeta( $user->ID, 'nickname', $wpdb->escape($user->user_nickname) );
-        if ( !empty( $user->user_level ) )
+        if ( !empty( $user->user_level ) ) {
             update_usermeta( $user->ID, $table_prefix . 'user_level', $user->user_level );
+            $role = translate_level_to_role($user->user_level);
+            update_usermeta( $user->ID, $table_prefix . 'capabilities', array($role => true) );
+        }
         if ( !empty( $user->user_icq ) )
             update_usermeta( $user->ID, 'icq', $wpdb->escape($user->user_icq) );
@@ -750 +753 @@
     return $template;
 }
+
+function translate_level_to_role($level) {
+    switch ($level) {
+    case 10:
+    case 9:
+    case 8:
+        return 'publisher';
+    case 7:
+    case 6:
+    case 5:
+        return 'managing_editor';
+    case 4:
+    case 3:
+        return 'copy_editor';
+    case 2:
+        return 'staff_writer';
+    case 1:
+        return 'freelancer';
+    case 0:
+        return 'visitor';
+    }
+}
+
 ?>

trunk/wp-admin/upgrade-schema.php

@@ -217 +217 @@
     add_option('use_trackback', 0);
 
+    populate_roles();
+
     // Delete unused options
     $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url');
@@ -230 +232 @@
 }
 
+function populate_roles() {
+    global $table_prefix;
+
+    $roles = array ('administrator' =>
+                                    array('name' => __('Administrator'),
+                                            'capabilities' => array(
+                                                'edit_posts' => true,
+                                                'edit_others_posts' => true,
+                                                'edit_published_posts' => true,
+                                                'publish_posts' => true,
+                                                'edit_pages' => true,
+                                                'manage_categories' => true,
+                                                'manage_links' => true,
+                                                'upload_images' => true,
+                                                'manage_options' => true,
+                                                'switch_themes' => true,
+                                                'edit_themes' => true,
+                                                'activate_plugins' => true,
+                                                'edit_plugins' => true,
+                                                'edit_users' => true,
+                                                'edit_files' => true,
+                                                'read' => true,
+                                                'level_10' => true,
+                                                'level_9' => true,
+                                                'level_8' => true
+                                                )),
+
+                                    'editor' =>
+                                    array('name' => __('Editor'),
+                                            'capabilities' => array(
+                                                'edit_posts' => true,
+                                                'edit_others_posts' => true,
+                                                'edit_published_posts' => true,
+                                                'publish_posts' => true,
+                                                'edit_pages' => true,
+                                                'manage_categories' => true,
+                                                'manage_links' => true,
+                                                'upload_images' => true,
+                                                'read' => true,
+                                                'level_7' => true,
+                                                'level_6' => true,
+                                                'level_5' => true
+                                                )),
+
+                                    'author' =>
+                                    array('name' => __('Author'),
+                                            'capabilities' => array(
+                                                'edit_posts' => true,
+                                                'publish_posts' => true,
+                                                'upload_images' => true,
+                                                'read' => true,
+                                                'level_2' => true
+                                                )),
+
+                                    'contributor' =>
+                                    array('name' => __('Contributor'),
+                                            'capabilities' => array(
+                                                'edit_posts' => true,
+                                                'read' => true,
+                                                'level_1' => true
+                                                )),
+                                            
+                                    'subscriber' =>
+                                    array('name' => __('Subscriber'),
+                                            'capabilities' => array(
+                                                'read' => true,
+                                                'level_0' => true
+                                                )),
+
+                                    'inactive' =>
+                                    array('name' => __('Inactive'),
+                                                'capabilities' => array())
+                                    );
+
+    add_option($table_prefix . 'user_roles', $roles);
+}
 ?>

trunk/wp-includes/functions.php

@@ -1219 +1219 @@
 function update_category_cache() {
     global $cache_categories, $wpdb;
-    $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories");
-    foreach ($dogs as $catt)
-        $cache_categories[$catt->cat_ID] = $catt;
-}
-
-function update_user_cache() {
-    global $cache_userdata, $wpdb;
-    $level_key = $wpdb->prefix . 'user_level';
-    $user_ids = $wpdb->get_col("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$level_key'");
-    $user_ids = join(',', $user_ids);
-    $query = apply_filters('user_cache_query', "SELECT * FROM $wpdb->users WHERE ID IN ($user_ids)");
-    if ( $users = $wpdb->get_results( $query ) ) :
-        foreach ($users as $user) :
-            $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user->ID'");
-            foreach ( $metavalues as $meta ) {
-                $user->{$meta->meta_key} = $meta->meta_value;
-                // We need to set user_level from meta, not row
-                if ( $wpdb->prefix . 'user_level' == $meta->meta_key )
-                    $user->user_level = $meta->meta_value;
-            }
-
-            $cache_userdata[$user->ID] = $user;
-            $cache_userdata[$user->user_login] =& $cache_userdata[$user->ID];
-        endforeach;
+    if($dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories")):
+        foreach ($dogs as $catt)
+            $cache_categories[$catt->cat_ID] = $catt;
         return true;
-    else : 
+    else:
         return false;
     endif;
@@ -1960 +1939 @@
 }
 
+function get_usermeta( $user_id, $meta_key = '') {
+    global $wpdb;
+    $user_id = (int) $user_id;
+
+    if ( !empty($meta_key) ) {
+        $meta_key = preg_replace('|a-z0-9_|i', '', $meta_key);
+        $metas = $wpdb->get_results("SELECT * FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
+    } else {
+        $metas = $wpdb->get_results("SELECT * FROM $wpdb->usermeta WHERE user_id = '$user_id'");
+    }
+
+    foreach ($metas as $index => $meta) {
+        @ $value = unserialize($meta->meta_key);
+        if ($value !== FALSE)
+            $metas[$index]->meta_key = $value;          
+    }
+
+    if ( !empty($meta_key) )
+        return $metas[0];
+    else
+        return $metas;
+}
+
 function update_usermeta( $user_id, $meta_key, $meta_value ) {
     global $wpdb;
@@ -1965 +1967 @@
         return false;
     $meta_key = preg_replace('|a-z0-9_|i', '', $meta_key);
+
+    if ( is_array($meta_value) || is_object($meta_value) )
+        $meta_value = serialize($meta_value);
+
     $cur = $wpdb->get_row("SELECT * FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
     if ( !$cur ) {

trunk/wp-includes/pluggable-functions.php

@@ -20 +20 @@
     $user_pass_md5 = md5($userdata->user_pass);
     $user_identity = $userdata->display_name;
-    $current_user  = $userdata;
+
+    if ( empty($current_user) )
+        $current_user = new WP_User($user_ID);
 }
 endif;
@@ -30 +32 @@
     if ( $user_id == 0 )
         return false;
-
+        
     if ( isset( $cache_userdata[$user_id] ) ) 
         return $cache_userdata[$user_id];
@@ -40 +42 @@
 
     foreach ( $metavalues as $meta ) {
-        $user->{$meta->meta_key} = $meta->meta_value;
+        @ $value = unserialize($meta->meta_value);
+        if ($value === FALSE)
+            $value = $meta->meta_value;
+        $user->{$meta->meta_key} = $value;
+
         // We need to set user_level from meta, not row
         if ( $wpdb->prefix . 'user_level' == $meta->meta_key )

trunk/wp-settings.php

@@ -75 +75 @@
 
 $wpdb->hide_errors();
-if ( !update_user_cache() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !defined('WP_INSTALLING')) ) {
+if ( !update_category_cache() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !defined('WP_INSTALLING')) ) {
     if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
         $link = 'install.php';
@@ -86 +86 @@
 require (ABSPATH . WPINC . '/functions-formatting.php');
 require (ABSPATH . WPINC . '/functions-post.php');
+require (ABSPATH . WPINC . '/capabilities.php');
 require (ABSPATH . WPINC . '/classes.php');
 require (ABSPATH . WPINC . '/template-functions-general.php');
@@ -161 +162 @@
 $wp_rewrite = new WP_Rewrite();
 $wp = new WP();
+$wp_roles = new WP_Roles();
 
 // Everything is loaded and initialized.