Changeset 3513 for trunk/wp-admin/admin-functions.php

Timestamp:

02/11/2006 09:56:02 AM (21 years ago)

Author:

ryan

Message:

Add new page caps now that pages can be draft or publish. Brings page caps to parity with posts. Add delete caps for posts and pages. fixes #2382 #2336 #2301

File:

• trunk/wp-admin/admin-functions.php (modified) (7 diffs)

trunk/wp-admin/admin-functions.php

@@ -5 +5 @@
         global $user_ID;
 
-        if (!current_user_can('edit_posts'))
-                die(__('You are not allowed to create posts or drafts on this blog.'));
+        if ( 'page' == $_POST['post_type'] ) {
+                if ( !current_user_can('edit_pages') )
+                        die(__('You are not allowed to create pages on this blog.'));   
+        } else {
+                if ( !current_user_can('edit_posts') )
+                        die(__('You are not allowed to create posts or drafts on this blog.'));
+        }
 
         // Rename.
@@ -16 +21 @@
         if (!empty ($_POST['post_author_override'])) {
                 $_POST['post_author'] = (int) $_POST['post_author_override'];
-        } else
+        } else {
                 if (!empty ($_POST['post_author'])) {
                         $_POST['post_author'] = (int) $_POST['post_author'];
@@ -23 +28 @@
                 }
 
-        if (($_POST['post_author'] != $_POST['user_ID']) && !current_user_can('edit_others_posts'))
-                die(__('You cannot post as this user.'));
+        }
+
+        if ($_POST['post_author'] != $_POST['user_ID']) {
+                if ( 'page' == $_POST['post_type'] ) {          
+                        if ( !current_user_can('edit_others_pages') )
+                                die(__('You cannot create pages as this user.'));
+                } else {
+                        if ( !current_user_can('edit_others_posts') )
+                                die(__('You cannot post as this user.'));
+                        
+                }
+        }
 
         // What to do based on which button they pressed
@@ -35 +50 @@
         if ('' != $_POST['advanced'])
                 $_POST['post_status'] = 'draft';
-        //if ('' != $_POST['savepage']) {
-        //      $_POST['post_status'] = 'draft';
-
-        if ('publish' == $_POST['post_status'] && !current_user_can('publish_posts'))
-                $_POST['post_status'] = 'draft';
-
-        if ('page' == $_POST['post_type'] && !current_user_can('edit_pages'))
-                die(__('This user cannot edit pages.'));
+
+        if ( 'page' == $_POST['post_type'] ) {
+                if ('publish' == $_POST['post_status'] && !current_user_can('publish_pages'))
+                        $_POST['post_status'] = 'draft';        
+        } else {
+                if ('publish' == $_POST['post_status'] && !current_user_can('publish_posts'))
+                        $_POST['post_status'] = 'draft';
+        }
 
         if (!empty ($_POST['edit_date'])) {
@@ -124 +139 @@
         $post_ID = (int) $_POST['post_ID'];
 
-        if (!current_user_can('edit_post', $post_ID))
-                die(__('You are not allowed to edit this post.'));
+        if ( 'page' == $_POST['post_type'] ) {
+                if ( !current_user_can('edit_page', $post_ID) )
+                        die(__('You are not allowed to edit this page.'));      
+        } else {
+                if ( !current_user_can('edit_post', $post_ID) )
+                        die(__('You are not allowed to edit this post.'));
+        }
 
         // Rename.
@@ -143 +163 @@
                 }
 
-        if (($_POST['post_author'] != $_POST['user_ID']) && !current_user_can('edit_others_posts'))
-                die(__('You cannot post as this user.'));
+        if ($_POST['post_author'] != $_POST['user_ID']) {
+                if ( 'page' == $_POST['post_type'] ) {          
+                        if ( !current_user_can('edit_others_pages') )
+                                die(__('You cannot edit pages as this user.'));
+                } else {
+                        if ( !current_user_can('edit_others_posts') )
+                                die(__('You cannot edit posts as this user.'));
+                        
+                }
+        }
 
         // What to do based on which button they pressed
@@ -155 +183 @@
         if ('' != $_POST['advanced'])
                 $_POST['post_status'] = 'draft';
-        //if ('' != $_POST['savepage'])
-        //      $_POST['post_status'] = 'static';
-
-        if ('publish' == $_POST['post_status'] && !current_user_can('publish_posts'))
-                $_POST['post_status'] = 'draft';
-
-        if ('static' == $_POST['post_status'] && !current_user_can('edit_pages'))
-                die(__('This user cannot edit pages.'));
+
+        if ( 'page' == $_POST['post_type'] ) {
+                if ('publish' == $_POST['post_status'] && !current_user_can('edit_published_pages'))
+                        $_POST['post_status'] = 'draft';        
+        } else {
+                if ('publish' == $_POST['post_status'] && !current_user_can('edit_published_posts'))
+                        $_POST['post_status'] = 'draft';
+        }
 
         if (!isset ($_POST['comment_status']))