X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..refs/tags/wordpress-3.6.1-scripts:/wp-includes/capabilities.php
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 7d8a00d7..c3bb58f6 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -73,14 +73,11 @@ class WP_Roles {
var $use_db = true;
/**
- * PHP4 Constructor - Call {@link WP_Roles::_init()} method.
+ * Constructor
*
* @since 2.0.0
- * @access public
- *
- * @return WP_Roles
*/
- function WP_Roles() {
+ function __construct() {
$this->_init();
}
@@ -111,7 +108,37 @@ class WP_Roles {
$this->role_objects = array();
$this->role_names = array();
- foreach ( (array) $this->roles as $role => $data ) {
+ foreach ( array_keys( $this->roles ) as $role ) {
+ $this->role_objects[$role] = new WP_Role( $role, $this->roles[$role]['capabilities'] );
+ $this->role_names[$role] = $this->roles[$role]['name'];
+ }
+ }
+
+ /**
+ * Reinitialize the object
+ *
+ * Recreates the role objects. This is typically called only by switch_to_blog()
+ * after switching wpdb to a new blog ID.
+ *
+ * @since 3.5.0
+ * @access public
+ */
+ function reinit() {
+ // There is no need to reinit if using the wp_user_roles global.
+ if ( ! $this->use_db )
+ return;
+
+ global $wpdb, $wp_user_roles;
+
+ // Duplicated from _init() to avoid an extra function call.
+ $this->role_key = $wpdb->prefix . 'user_roles';
+ $this->roles = get_option( $this->role_key );
+ if ( empty( $this->roles ) )
+ return;
+
+ $this->role_objects = array();
+ $this->role_names = array();
+ foreach ( array_keys( $this->roles ) as $role ) {
$this->role_objects[$role] = new WP_Role( $role, $this->roles[$role]['capabilities'] );
$this->role_names[$role] = $this->roles[$role]['name'];
}
@@ -131,7 +158,7 @@ class WP_Roles {
* @param string $role Role name.
* @param string $display_name Role display name.
* @param array $capabilities List of role capabilities in the above format.
- * @return null|WP_Role WP_Role object if role is added, null if already exists.
+ * @return WP_Role|null WP_Role object if role is added, null if already exists.
*/
function add_role( $role, $display_name, $capabilities = array() ) {
if ( isset( $this->roles[$role] ) )
@@ -179,6 +206,9 @@ class WP_Roles {
* @param bool $grant Optional, default is true. Whether role is capable of performing capability.
*/
function add_cap( $role, $cap, $grant = true ) {
+ if ( ! isset( $this->roles[$role] ) )
+ return;
+
$this->roles[$role]['capabilities'][$cap] = $grant;
if ( $this->use_db )
update_option( $this->role_key, $this->roles );
@@ -194,6 +224,9 @@ class WP_Roles {
* @param string $cap Capability name.
*/
function remove_cap( $role, $cap ) {
+ if ( ! isset( $this->roles[$role] ) )
+ return;
+
unset( $this->roles[$role]['capabilities'][$cap] );
if ( $this->use_db )
update_option( $this->role_key, $this->roles );
@@ -206,9 +239,9 @@ class WP_Roles {
* @access public
*
* @param string $role Role name.
- * @return object|null Null, if role does not exist. WP_Role object, if found.
+ * @return WP_Role|null WP_Role object if found, null if the role does not exist.
*/
- function &get_role( $role ) {
+ function get_role( $role ) {
if ( isset( $this->role_objects[$role] ) )
return $this->role_objects[$role];
else
@@ -236,8 +269,7 @@ class WP_Roles {
* @param string $role Role name to look up.
* @return bool
*/
- function is_role( $role )
- {
+ function is_role( $role ) {
return isset( $this->role_names[$role] );
}
}
@@ -269,7 +301,7 @@ class WP_Role {
var $capabilities;
/**
- * PHP4 Constructor - Set up object properties.
+ * Constructor - Set up object properties.
*
* The list of capabilities, must have the key as the name of the capability
* and the value a boolean of whether it is granted to the role.
@@ -279,9 +311,8 @@ class WP_Role {
*
* @param string $role Role name.
* @param array $capabilities List of capabilities.
- * @return WP_Role
*/
- function WP_Role( $role, $capabilities ) {
+ function __construct( $role, $capabilities ) {
$this->name = $role;
$this->capabilities = $capabilities;
}
@@ -364,8 +395,6 @@ class WP_User {
/**
* User data container.
*
- * This will be set as properties of the object.
- *
* @since 2.0.0
* @access private
* @var array
@@ -381,17 +410,6 @@ class WP_User {
*/
var $ID = 0;
- /**
- * The deprecated user's ID.
- *
- * @since 2.0.0
- * @access public
- * @deprecated Use WP_User::$ID
- * @see WP_User::$ID
- * @var int
- */
- var $id = 0;
-
/**
* The individual capabilities the user has been given.
*
@@ -428,28 +446,6 @@ class WP_User {
*/
var $allcaps = array();
- /**
- * First name of the user.
- *
- * Created to prevent notices.
- *
- * @since 2.7.0
- * @access public
- * @var string
- */
- var $first_name = '';
-
- /**
- * Last name of the user.
- *
- * Created to prevent notices.
- *
- * @since 2.7.0
- * @access public
- * @var string
- */
- var $last_name = '';
-
/**
* The filter context applied to user data fields.
*
@@ -459,47 +455,243 @@ class WP_User {
*/
var $filter = null;
+ private static $back_compat_keys;
+
/**
- * PHP4 Constructor - Sets up the object properties.
+ * Constructor
*
- * Retrieves the userdata and then assigns all of the data keys to direct
- * properties of the object. Calls {@link WP_User::_init_caps()} after
- * setting up the object's user data properties.
+ * Retrieves the userdata and passes it to {@link WP_User::init()}.
*
* @since 2.0.0
* @access public
*
- * @param int|string $id User's ID or username
- * @param int $name Optional. User's username
+ * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
+ * @param string $name Optional. User's username
* @param int $blog_id Optional Blog ID, defaults to current blog.
* @return WP_User
*/
- function WP_User( $id, $name = '', $blog_id = '' ) {
+ function __construct( $id = 0, $name = '', $blog_id = '' ) {
+ if ( ! isset( self::$back_compat_keys ) ) {
+ $prefix = $GLOBALS['wpdb']->prefix;
+ self::$back_compat_keys = array(
+ 'user_firstname' => 'first_name',
+ 'user_lastname' => 'last_name',
+ 'user_description' => 'description',
+ 'user_level' => $prefix . 'user_level',
+ $prefix . 'usersettings' => $prefix . 'user-settings',
+ $prefix . 'usersettingstime' => $prefix . 'user-settings-time',
+ );
+ }
- if ( empty( $id ) && empty( $name ) )
+ if ( is_a( $id, 'WP_User' ) ) {
+ $this->init( $id->data, $blog_id );
return;
+ } elseif ( is_object( $id ) ) {
+ $this->init( $id, $blog_id );
+ return;
+ }
- if ( ! is_numeric( $id ) ) {
+ if ( ! empty( $id ) && ! is_numeric( $id ) ) {
$name = $id;
$id = 0;
}
- if ( ! empty( $id ) )
- $this->data = get_userdata( $id );
+ if ( $id )
+ $data = self::get_data_by( 'id', $id );
else
- $this->data = get_userdatabylogin( $name );
+ $data = self::get_data_by( 'login', $name );
- if ( empty( $this->data->ID ) )
- return;
+ if ( $data )
+ $this->init( $data, $blog_id );
+ }
- foreach ( get_object_vars( $this->data ) as $key => $value ) {
- $this->{$key} = $value;
- }
+ /**
+ * Sets up object properties, including capabilities.
+ *
+ * @param object $data User DB row object
+ * @param int $blog_id Optional. The blog id to initialize for
+ */
+ function init( $data, $blog_id = '' ) {
+ $this->data = $data;
+ $this->ID = (int) $data->ID;
- $this->id = $this->ID;
$this->for_blog( $blog_id );
}
+ /**
+ * Return only the main user fields
+ *
+ * @since 3.3.0
+ *
+ * @param string $field The field to query against: 'id', 'slug', 'email' or 'login'
+ * @param string|int $value The field value
+ * @return object Raw user object
+ */
+ static function get_data_by( $field, $value ) {
+ global $wpdb;
+
+ if ( 'id' == $field ) {
+ // Make sure the value is numeric to avoid casting objects, for example,
+ // to int 1.
+ if ( ! is_numeric( $value ) )
+ return false;
+ $value = intval( $value );
+ if ( $value < 1 )
+ return false;
+ } else {
+ $value = trim( $value );
+ }
+
+ if ( !$value )
+ return false;
+
+ switch ( $field ) {
+ case 'id':
+ $user_id = $value;
+ $db_field = 'ID';
+ break;
+ case 'slug':
+ $user_id = wp_cache_get($value, 'userslugs');
+ $db_field = 'user_nicename';
+ break;
+ case 'email':
+ $user_id = wp_cache_get($value, 'useremail');
+ $db_field = 'user_email';
+ break;
+ case 'login':
+ $value = sanitize_user( $value );
+ $user_id = wp_cache_get($value, 'userlogins');
+ $db_field = 'user_login';
+ break;
+ default:
+ return false;
+ }
+
+ if ( false !== $user_id ) {
+ if ( $user = wp_cache_get( $user_id, 'users' ) )
+ return $user;
+ }
+
+ if ( !$user = $wpdb->get_row( $wpdb->prepare(
+ "SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
+ ) ) )
+ return false;
+
+ update_user_caches( $user );
+
+ return $user;
+ }
+
+ /**
+ * Magic method for checking the existence of a certain custom field
+ *
+ * @since 3.3.0
+ */
+ function __isset( $key ) {
+ if ( 'id' == $key ) {
+ _deprecated_argument( 'WP_User->id', '2.1', __( 'Use WP_User->ID
instead.' ) );
+ $key = 'ID';
+ }
+
+ if ( isset( $this->data->$key ) )
+ return true;
+
+ if ( isset( self::$back_compat_keys[ $key ] ) )
+ $key = self::$back_compat_keys[ $key ];
+
+ return metadata_exists( 'user', $this->ID, $key );
+ }
+
+ /**
+ * Magic method for accessing custom fields
+ *
+ * @since 3.3.0
+ */
+ function __get( $key ) {
+ if ( 'id' == $key ) {
+ _deprecated_argument( 'WP_User->id', '2.1', __( 'Use WP_User->ID
instead.' ) );
+ return $this->ID;
+ }
+
+ if ( isset( $this->data->$key ) ) {
+ $value = $this->data->$key;
+ } else {
+ if ( isset( self::$back_compat_keys[ $key ] ) )
+ $key = self::$back_compat_keys[ $key ];
+ $value = get_user_meta( $this->ID, $key, true );
+ }
+
+ if ( $this->filter ) {
+ $value = sanitize_user_field( $key, $value, $this->ID, $this->filter );
+ }
+
+ return $value;
+ }
+
+ /**
+ * Magic method for setting custom fields
+ *
+ * @since 3.3.0
+ */
+ function __set( $key, $value ) {
+ if ( 'id' == $key ) {
+ _deprecated_argument( 'WP_User->id', '2.1', __( 'Use WP_User->ID
instead.' ) );
+ $this->ID = $value;
+ return;
+ }
+
+ $this->data->$key = $value;
+ }
+
+ /**
+ * Determine whether the user exists in the database.
+ *
+ * @since 3.4.0
+ * @access public
+ *
+ * @return bool True if user exists in the database, false if not.
+ */
+ function exists() {
+ return ! empty( $this->ID );
+ }
+
+ /**
+ * Retrieve the value of a property or meta key.
+ *
+ * Retrieves from the users and usermeta table.
+ *
+ * @since 3.3.0
+ *
+ * @param string $key Property
+ */
+ function get( $key ) {
+ return $this->__get( $key );
+ }
+
+ /**
+ * Determine whether a property or meta key is set
+ *
+ * Consults the users and usermeta tables.
+ *
+ * @since 3.3.0
+ *
+ * @param string $key Property
+ */
+ function has_prop( $key ) {
+ return $this->__isset( $key );
+ }
+
+ /*
+ * Return an array representation.
+ *
+ * @since 3.5.0
+ *
+ * @return array Array representation.
+ */
+ function to_array() {
+ return get_object_vars( $this->data );
+ }
+
/**
* Set up capability object properties.
*
@@ -508,20 +700,24 @@ class WP_User {
* property matching the 'cap_key' exists and is an array. If so, it will be
* used.
*
+ * @access protected
* @since 2.1.0
*
* @param string $cap_key Optional capability key
- * @access protected
*/
function _init_caps( $cap_key = '' ) {
global $wpdb;
+
if ( empty($cap_key) )
$this->cap_key = $wpdb->prefix . 'capabilities';
else
$this->cap_key = $cap_key;
- $this->caps = &$this->{$this->cap_key};
+
+ $this->caps = get_user_meta( $this->ID, $this->cap_key, true );
+
if ( ! is_array( $this->caps ) )
$this->caps = array();
+
$this->get_role_caps();
}
@@ -545,12 +741,12 @@ class WP_User {
//Filter out caps that are not role names and assign to $this->roles
if ( is_array( $this->caps ) )
- $this->roles = array_filter( array_keys( $this->caps ), array( &$wp_roles, 'is_role' ) );
+ $this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
//Build $allcaps from role caps, overlay user's $caps
$this->allcaps = array();
foreach ( (array) $this->roles as $role ) {
- $the_role =& $wp_roles->get_role( $role );
+ $the_role = $wp_roles->get_role( $role );
$this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities );
}
$this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
@@ -603,12 +799,13 @@ class WP_User {
* @param string $role Role name.
*/
function set_role( $role ) {
+ if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
+ return;
+
foreach ( (array) $this->roles as $oldrole )
unset( $this->caps[$oldrole] );
- if ( 1 == count( $this->roles ) && $role == $this->roles[0] )
- return;
-
+ $old_roles = $this->roles;
if ( !empty( $role ) ) {
$this->caps[$role] = true;
$this->roles = array( $role => true );
@@ -618,7 +815,7 @@ class WP_User {
update_user_meta( $this->ID, $this->cap_key, $this->caps );
$this->get_role_caps();
$this->update_user_level_from_caps();
- do_action( 'set_user_role', $this->ID, $role );
+ do_action( 'set_user_role', $this->ID, $role, $old_roles );
}
/**
@@ -661,7 +858,7 @@ class WP_User {
*/
function update_user_level_from_caps() {
global $wpdb;
- $this->user_level = array_reduce( array_keys( $this->allcaps ), array( &$this, 'level_reduction' ), 0 );
+ $this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 );
update_user_meta( $this->ID, $wpdb->prefix . 'user_level', $this->user_level );
}
@@ -688,7 +885,7 @@ class WP_User {
* @param string $cap Capability name.
*/
function remove_cap( $cap ) {
- if ( empty( $this->caps[$cap] ) )
+ if ( ! isset( $this->caps[$cap] ) )
return;
unset( $this->caps[$cap] );
update_user_meta( $this->ID, $this->cap_key, $this->caps );
@@ -713,13 +910,12 @@ class WP_User {
*
* This is useful for looking up whether the user has a specific role
* assigned to the user. The second optional parameter can also be used to
- * check for capabilities against a specfic post.
+ * check for capabilities against a specific object, such as a post or user.
*
* @since 2.0.0
* @access public
*
* @param string|int $cap Capability or role name to search.
- * @param int $post_id Optional. Post ID to check capability against specific post.
* @return bool True, if user has capability; false, if user does not have capability.
*/
function has_cap( $cap ) {
@@ -743,8 +939,7 @@ class WP_User {
$capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args );
$capabilities['exist'] = true; // Everyone is allowed to exist
foreach ( (array) $caps as $cap ) {
- //echo "Checking cap $cap
";
- if ( empty( $capabilities[$cap] ) || !$capabilities[$cap] )
+ if ( empty( $capabilities[ $cap ] ) )
return false;
}
@@ -809,21 +1004,25 @@ function map_meta_cap( $cap, $user_id ) {
$caps[] = 'promote_users';
break;
case 'edit_user':
+ case 'edit_users':
// Allow user to edit itself
- if ( isset( $args[0] ) && $user_id == $args[0] )
+ if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
break;
- // Fall through
- case 'edit_users':
+
// If multisite these caps are allowed only for super admins.
if ( is_multisite() && !is_super_admin( $user_id ) )
$caps[] = 'do_not_allow';
else
- $caps[] = 'edit_users'; // Explicit due to primitive fall through
+ $caps[] = 'edit_users'; // edit_user maps to edit_users.
break;
case 'delete_post':
case 'delete_page':
- $author_data = get_userdata( $user_id );
$post = get_post( $args[0] );
+
+ if ( 'revision' == $post->post_type ) {
+ $post = get_post( $post->post_parent );
+ }
+
$post_type = get_post_type_object( $post->post_type );
if ( ! $post_type->map_meta_cap ) {
@@ -834,12 +1033,13 @@ function map_meta_cap( $cap, $user_id ) {
break;
}
- if ( '' != $post->post_author ) {
- $post_author_data = get_userdata( $post->post_author );
- } else {
- // No author set yet, so default to current user for cap checks.
- $post_author_data = $author_data;
- }
+ $post_author_id = $post->post_author;
+
+ // If no author set yet, default to current user for cap checks.
+ if ( ! $post_author_id )
+ $post_author_id = $user_id;
+
+ $post_author_data = $post_author_id == get_current_user_id() ? wp_get_current_user() : get_userdata( $post_author_id );
// If the user is the author...
if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID ) {
@@ -867,8 +1067,12 @@ function map_meta_cap( $cap, $user_id ) {
// edit_others_posts
case 'edit_post':
case 'edit_page':
- $author_data = get_userdata( $user_id );
$post = get_post( $args[0] );
+
+ if ( 'revision' == $post->post_type ) {
+ $post = get_post( $post->post_parent );
+ }
+
$post_type = get_post_type_object( $post->post_type );
if ( ! $post_type->map_meta_cap ) {
@@ -879,14 +1083,14 @@ function map_meta_cap( $cap, $user_id ) {
break;
}
- if ( '' != $post->post_author ) {
- $post_author_data = get_userdata( $post->post_author );
- } else {
- // No author set yet, so default to current user for cap checks.
- $post_author_data = $author_data;
- }
+ $post_author_id = $post->post_author;
+
+ // If no author set yet, default to current user for cap checks.
+ if ( ! $post_author_id )
+ $post_author_id = $user_id;
+
+ $post_author_data = $post_author_id == get_current_user_id() ? wp_get_current_user() : get_userdata( $post_author_id );
- //echo "current user id : $user_id, post author id: " . $post_author_data->ID . "
";
// If the user is the author...
if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID ) {
// If the post is published...
@@ -911,8 +1115,12 @@ function map_meta_cap( $cap, $user_id ) {
break;
case 'read_post':
case 'read_page':
- $author_data = get_userdata( $user_id );
$post = get_post( $args[0] );
+
+ if ( 'revision' == $post->post_type ) {
+ $post = get_post( $post->post_parent );
+ }
+
$post_type = get_post_type_object( $post->post_type );
if ( ! $post_type->map_meta_cap ) {
@@ -923,29 +1131,53 @@ function map_meta_cap( $cap, $user_id ) {
break;
}
- if ( 'private' != $post->post_status ) {
+ $status_obj = get_post_status_object( $post->post_status );
+ if ( $status_obj->public ) {
$caps[] = $post_type->cap->read;
break;
}
- if ( '' != $post->post_author ) {
- $post_author_data = get_userdata( $post->post_author );
- } else {
- // No author set yet, so default to current user for cap checks.
- $post_author_data = $author_data;
- }
+ $post_author_id = $post->post_author;
+
+ // If no author set yet, default to current user for cap checks.
+ if ( ! $post_author_id )
+ $post_author_id = $user_id;
+
+ $post_author_data = $post_author_id == get_current_user_id() ? wp_get_current_user() : get_userdata( $post_author_id );
if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID )
$caps[] = $post_type->cap->read;
- else
+ elseif ( $status_obj->private )
$caps[] = $post_type->cap->read_private_posts;
+ else
+ $caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+ break;
+ case 'publish_post':
+ $post = get_post( $args[0] );
+ $post_type = get_post_type_object( $post->post_type );
+
+ $caps[] = $post_type->cap->publish_posts;
+ break;
+ case 'edit_post_meta':
+ case 'delete_post_meta':
+ case 'add_post_meta':
+ $post = get_post( $args[0] );
+ $caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+
+ $meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
+
+ if ( $meta_key && has_filter( "auth_post_meta_{$meta_key}" ) ) {
+ $allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
+ if ( ! $allowed )
+ $caps[] = $cap;
+ } elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
+ $caps[] = $cap;
+ }
break;
case 'edit_comment':
$comment = get_comment( $args[0] );
$post = get_post( $comment->comment_post_ID );
- $post_type_object = get_post_type_object( $post->post_type );
-
- $caps = map_meta_cap( $post_type_object->cap->edit_post, $user_id, $post->ID );
+ $caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
break;
case 'unfiltered_upload':
if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) ) )
@@ -953,14 +1185,28 @@ function map_meta_cap( $cap, $user_id ) {
else
$caps[] = 'do_not_allow';
break;
+ case 'unfiltered_html' :
+ // Disallow unfiltered_html for all users, even admins and super admins.
+ if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+ $caps[] = 'do_not_allow';
+ elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+ $caps[] = 'do_not_allow';
+ else
+ $caps[] = $cap;
+ break;
case 'edit_files':
case 'edit_plugins':
case 'edit_themes':
- if ( defined('DISALLOW_FILE_EDIT') && DISALLOW_FILE_EDIT ) {
+ // Disallow the file editors.
+ if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
$caps[] = 'do_not_allow';
- break;
- }
- // Fall through if not DISALLOW_FILE_EDIT.
+ elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+ $caps[] = 'do_not_allow';
+ elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+ $caps[] = 'do_not_allow';
+ else
+ $caps[] = $cap;
+ break;
case 'update_plugins':
case 'delete_plugins':
case 'install_plugins':
@@ -968,30 +1214,31 @@ function map_meta_cap( $cap, $user_id ) {
case 'delete_themes':
case 'install_themes':
case 'update_core':
- // Disallow anything that creates, deletes, or edits core, plugin, or theme files.
+ // Disallow anything that creates, deletes, or updates core, plugin, or theme files.
// Files in uploads are excepted.
- if ( defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS ) {
+ if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
$caps[] = 'do_not_allow';
- break;
- }
- // Fall through if not DISALLOW_FILE_MODS.
- case 'unfiltered_html':
- // Disallow unfiltered_html for all users, even admins and super admins.
- if ( defined('DISALLOW_UNFILTERED_HTML') && DISALLOW_UNFILTERED_HTML ) {
+ elseif ( is_multisite() && ! is_super_admin( $user_id ) )
$caps[] = 'do_not_allow';
- break;
+ else
+ $caps[] = $cap;
+ break;
+ case 'activate_plugins':
+ $caps[] = $cap;
+ if ( is_multisite() ) {
+ // update_, install_, and delete_ are handled above with is_super_admin().
+ $menu_perms = get_site_option( 'menu_items', array() );
+ if ( empty( $menu_perms['plugins'] ) )
+ $caps[] = 'manage_network_plugins';
}
- // Fall through if not DISALLOW_UNFILTERED_HTML
+ break;
case 'delete_user':
case 'delete_users':
- // If multisite these caps are allowed only for super admins.
- if ( is_multisite() && !is_super_admin( $user_id ) ) {
+ // If multisite only super admins can delete users.
+ if ( is_multisite() && ! is_super_admin( $user_id ) )
$caps[] = 'do_not_allow';
- } else {
- if ( 'delete_user' == $cap )
- $cap = 'delete_users';
- $caps[] = $cap;
- }
+ else
+ $caps[] = 'delete_users'; // delete_user maps to delete_users.
break;
case 'create_users':
if ( !is_multisite() )
@@ -1001,6 +1248,12 @@ function map_meta_cap( $cap, $user_id ) {
else
$caps[] = 'do_not_allow';
break;
+ case 'manage_links' :
+ if ( get_option( 'link_manager_enabled' ) )
+ $caps[] = $cap;
+ else
+ $caps[] = 'do_not_allow';
+ break;
default:
// Handle meta capabilities for custom post types.
$post_type_meta_caps = _post_type_meta_capabilities();
@@ -1033,7 +1286,7 @@ function current_user_can( $capability ) {
$args = array_slice( func_get_args(), 1 );
$args = array_merge( array( $capability ), $args );
- return call_user_func_array( array( &$current_user, 'has_cap' ), $args );
+ return call_user_func_array( array( $current_user, 'has_cap' ), $args );
}
/**
@@ -1046,21 +1299,23 @@ function current_user_can( $capability ) {
* @return bool
*/
function current_user_can_for_blog( $blog_id, $capability ) {
+ if ( is_multisite() )
+ switch_to_blog( $blog_id );
+
$current_user = wp_get_current_user();
if ( empty( $current_user ) )
return false;
- // Create new object to avoid stomping the global current_user.
- $user = new WP_User( $current_user->id) ;
-
- // Set the blog id. @todo add blog id arg to WP_User constructor?
- $user->for_blog( $blog_id );
-
$args = array_slice( func_get_args(), 2 );
$args = array_merge( array( $capability ), $args );
- return call_user_func_array( array( &$user, 'has_cap' ), $args );
+ $can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
+
+ if ( is_multisite() )
+ restore_current_blog();
+
+ return $can;
}
/**
@@ -1076,15 +1331,15 @@ function author_can( $post, $capability ) {
if ( !$post = get_post($post) )
return false;
- $author = new WP_User( $post->post_author );
+ $author = get_userdata( $post->post_author );
- if ( empty( $author->ID ) )
+ if ( ! $author )
return false;
$args = array_slice( func_get_args(), 2 );
$args = array_merge( array( $capability ), $args );
- return call_user_func_array( array( &$author, 'has_cap' ), $args );
+ return call_user_func_array( array( $author, 'has_cap' ), $args );
}
/**
@@ -1098,15 +1353,15 @@ function author_can( $post, $capability ) {
*/
function user_can( $user, $capability ) {
if ( ! is_object( $user ) )
- $user = new WP_User( $user );
+ $user = get_userdata( $user );
- if ( ! $user || ! $user->ID )
+ if ( ! $user || ! $user->exists() )
return false;
$args = array_slice( func_get_args(), 2 );
$args = array_merge( array( $capability ), $args );
- return call_user_func_array( array( &$user, 'has_cap' ), $args );
+ return call_user_func_array( array( $user, 'has_cap' ), $args );
}
/**
@@ -1116,7 +1371,7 @@ function user_can( $user, $capability ) {
* @since 2.0.0
*
* @param string $role Role name.
- * @return object
+ * @return WP_Role|null WP_Role object if found, null if the role does not exist.
*/
function get_role( $role ) {
global $wp_roles;
@@ -1136,7 +1391,7 @@ function get_role( $role ) {
* @param string $role Role name.
* @param string $display_name Display name for role.
* @param array $capabilities List of capabilities, e.g. array( 'edit_posts' => true, 'delete_posts' => false );
- * @return null|WP_Role WP_Role object if role is added, null if already exists.
+ * @return WP_Role|null WP_Role object if role is added, null if already exists.
*/
function add_role( $role, $display_name, $capabilities = array() ) {
global $wp_roles;
@@ -1192,12 +1447,12 @@ function get_super_admins() {
* @return bool True if the user is a site admin.
*/
function is_super_admin( $user_id = false ) {
- if ( $user_id )
- $user = new WP_User( $user_id );
- else
+ if ( ! $user_id || $user_id == get_current_user_id() )
$user = wp_get_current_user();
+ else
+ $user = get_userdata( $user_id );
- if ( empty( $user->id ) )
+ if ( ! $user || ! $user->exists() )
return false;
if ( is_multisite() ) {
@@ -1211,5 +1466,3 @@ function is_super_admin( $user_id = false ) {
return false;
}
-
-?>