Changeset 3746

Timestamp:

10/01/09 17:28:20 (2 years ago)

Author:

rickc

Message:

Make the undelete plugin ACL aware.

File:

• trunk/htdocs/system/plugins/undelete/undelete.plugin.php (modified) (5 diffs)

trunk/htdocs/system/plugins/undelete/undelete.plugin.php

@@ -41 +41 @@
                 // see the false return value, and simply return, leaving
                 // the post in the database.
-                if( $post->status != Post::status( 'deleted' ) && is_object( User::get_by_id( $post->user_id ) ) ) {
+                if( $post->status != Post::status( 'deleted' ) && ACL::access_check( $post->get_access(), 'delete' ) ) {
                         $post->info->prior_status = $post->status;
                         $post->status = Post::status( 'deleted' );
@@ -54 +54 @@
         public function filter_post_actions($actions, $post)
         {
-                if ( $post->status == Post::status('deleted') ) {
+                if ( $post->status == Post::status('deleted') && ACL::access_check( $post->get_access(), 'delete' ) ) {
                         $actions['remove']['label']= _t('Delete forever');
                         $actions['remove']['title']= _t('Permanently delete this post');
@@ -76 +76 @@
         {
                 $post = Post::get( array( 'id' => $post_id, 'status' => Post::status('any') ) );
-                if ( $post->status == Post::status('deleted') ) {
+                if ( $post->status == Post::status('deleted') && ACL::access_check( $post->get_access(), 'delete' ) ) {
                         $post->status = $post->info->prior_status ? $post->info->prior_status : Post::status( 'draft' );
                         unset( $post->info->prior_status );
@@ -106 +106 @@
         }
 
+        private function get_perms()
+        {
+                $type_perms = array();
+                $types = Post::list_active_post_types();
+                foreach( $types as $key => $value ) {
+                        $perm = array( 'post_' . $key => ACL::get_bitmask( 'delete' ) );
+                        $types_perms = array_merge( $type_perms, $perm );
+                }
+                $perms = array( 'own_posts' => ACL::get_bitmask( 'delete' ), 'post_any' => ACL::get_bitmask( 'delete' ) );
+                $perms = array_merge( $perms, $type_perms );
+                return $perms;
+        }
+
         public function filter_plugin_config( $actions, $plugin_id )
         {
                 if ( $plugin_id == $this->plugin_id() ) {
                         $actions[]= _t( 'Configure' );
-                        $actions[]= _t( 'Empty Trash' );
+                        if( User::identify()->can_any( $this->get_perms() ) ) {
+                                $actions[]= _t( 'Empty Trash' );
+                        }
                 }
                 return $actions;
@@ -161 +176 @@
 
                 foreach($posts as $post) {
-                        $post->delete();
-                        $count++;
+                        if( ACL::access_check( $post->get_access(), 'delete' ) ) {
+                                $post->delete();
+                                $count++;
+                        }
                 }