Changeset 2713

Timestamp:

07/15/05 01:27:01 (3 years ago)

Author:

ryan

Message:

Move user_can_*() functions to capabilities.php.

Files:

• trunk/wp-includes/capabilities.php (modified) (1 diff)
• trunk/wp-includes/functions-post.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -271 +271 @@
-}
-
+//
+// These are deprecated.  Use current_user_can().
+//
+
+/* returns true if $user_id can create a new post */
+function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
+    $author_data = get_userdata($user_id);
+    return ($author_data->user_level > 1);
+}
+
+/* returns true if $user_id can create a new post */
+function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
+    $author_data = get_userdata($user_id);
+    return ($author_data->user_level >= 1);
+}
+
+/* returns true if $user_id can edit $post_id */
+function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
+    $author_data = get_userdata($user_id);
+    $post = get_post($post_id);
+    $post_author_data = get_userdata($post->post_author);
+
+    if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' &&  $author_data->user_level < 2))
+         || ($author_data->user_level > $post_author_data->user_level)
+         || ($author_data->user_level >= 10) ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/* returns true if $user_id can delete $post_id */
+function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
+    // right now if one can edit, one can delete
+    return user_can_edit_post($user_id, $post_id, $blog_id);
+}
+
+/* returns true if $user_id can set new posts' dates on $blog_id */
+function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
+    $author_data = get_userdata($user_id);
+    return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));
+}
+
+/* returns true if $user_id can edit $post_id's date */
+function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
+    $author_data = get_userdata($user_id);
+    return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));
+}
+
+/* returns true if $user_id can edit $post_id's comments */
+function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
+    // right now if one can edit a post, one can edit comments made on it
+    return user_can_edit_post($user_id, $post_id, $blog_id);
+}
+
+/* returns true if $user_id can delete $post_id's comments */
+function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
+    // right now if one can edit comments, one can delete comments
+    return user_can_edit_post_comments($user_id, $post_id, $blog_id);
+}
+
+function user_can_edit_user($user_id, $other_user) {
+    $user  = get_userdata($user_id);
+    $other = get_userdata($other_user);
+    if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
+        return true;
+    else
+        return false;
+}
+
-?>

trunk/wp-includes/functions-post.php

@@ -382 +382 @@
-}
-
-
-// query user capabilities
-// rather simplistic. shall evolve with future permission system overhaul
-// $blog_id and $category_id are there for future usage
-
-/* returns true if $user_id can create a new post */
-function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
-    $author_data = get_userdata($user_id);
-    return ($author_data->user_level > 1);
-}
-
-/* returns true if $user_id can create a new post */
-function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
-    $author_data = get_userdata($user_id);
-    return ($author_data->user_level >= 1);
-}
-
-/* returns true if $user_id can edit $post_id */
-function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
-    $author_data = get_userdata($user_id);
-    $post = get_post($post_id);
-    $post_author_data = get_userdata($post->post_author);
-
-    if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' &&  $author_data->user_level < 2))
-         || ($author_data->user_level > $post_author_data->user_level)
-         || ($author_data->user_level >= 10) ) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/* returns true if $user_id can delete $post_id */
-function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
-    // right now if one can edit, one can delete
-    return user_can_edit_post($user_id, $post_id, $blog_id);
-}
-
-/* returns true if $user_id can set new posts' dates on $blog_id */
-function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
-    $author_data = get_userdata($user_id);
-    return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));
-}
-
-/* returns true if $user_id can edit $post_id's date */
-function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
-    $author_data = get_userdata($user_id);
-    return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));
-}
-
-/* returns true if $user_id can edit $post_id's comments */
-function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
-    // right now if one can edit a post, one can edit comments made on it
-    return user_can_edit_post($user_id, $post_id, $blog_id);
-}
-
-/* returns true if $user_id can delete $post_id's comments */
-function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
-    // right now if one can edit comments, one can delete comments
-    return user_can_edit_post_comments($user_id, $post_id, $blog_id);
-}
-
-function user_can_edit_user($user_id, $other_user) {
-    $user  = get_userdata($user_id);
-    $other = get_userdata($other_user);
-    if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
-        return true;
-    else
-        return false;
-}
-
-function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) {
-    global $wpdb;