Changeset 1989:b234959829da for plugins/maintenance/inc

Timestamp:

09/22/13 02:49:48 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Message:

Revamp plugin maintenance, step 5, now open to admin user and various fixes, addresses #999

Location:

plugins/maintenance/inc

Files:

• class.dc.maintenance.php (modified) (1 diff)
• class.dc.maintenance.task.php (modified) (4 diffs)
• tasks/class.dc.maintenance.indexcomments.php (modified) (1 diff)
• tasks/class.dc.maintenance.indexposts.php (modified) (1 diff)
• tasks/class.dc.maintenance.zipmedia.php (modified) (1 diff)
• tasks/class.dc.maintenance.ziptheme.php (modified) (1 diff)

plugins/maintenance/inc/class.dc.maintenance.php

@@ -77 +77 @@
                }
 
-               $this->tasks[$task] = new $task($this, 'plugin.php?p=maintenance');
+               if (($t = new $task($this, 'plugin.php?p=maintenance')) === null
+               || $t->perm() === null && !$this->core->auth->isSuperAdmin()
+               || !$this->core->auth->check($t->perm(), $this->core->blog->id)) {
+                    continue;
+               }
+
+               $this->tasks[$task] = $t;
           }
 

plugins/maintenance/inc/class.dc.maintenance.task.php

@@ -29 +29 @@
      protected $ajax = false;
      protected $blog = false;
+     protected $perm = null;
 
      protected $id;
@@ -55 +56 @@
           $this->init();
 
+          if ($this->perm() === null && !$this->core->auth->isSuperAdmin()
+          || !$this->core->auth->check($this->perm(), $this->core->blog->id)) {
+               return null;
+          }
+
           $this->p_url = $p_url;
           $this->id = get_class($this);
@@ -72 +78 @@
 
           $this->ts = abs((integer) $ts);
+
+          return true;
      }
 
@@ -83 +91 @@
      {
           return null;
+     }
+
+     /**
+      * Get task permission.
+      *
+      * Return user permission required to run this task 
+      * or null for super admin.
+      *
+      * @return <b>mixed</b> Permission.
+      */
+     public function perm()
+     {
+          return $this->perm;
+     }
+
+     /**
+      * Get task scope.
+      *.
+      * Is task limited to current blog.
+      *
+      * @return <b>boolean</b> Limit to blog
+      */
+     public function blog()
+     {
+          return $this->blog;
      }
 

plugins/maintenance/inc/tasks/class.dc.maintenance.indexcomments.php

@@ -22 +22 @@
      {
           $this->name         = __('Search engine index');
-          $this->task         = __('Index all comments');
+          $this->task         = __('Index all comments for search engine');
           $this->step_task    = __('Next');
           $this->step         = __('Indexing comment %d to %d.');

plugins/maintenance/inc/tasks/class.dc.maintenance.indexposts.php

@@ -22 +22 @@
      {
           $this->name         = __('Search engine index');
-          $this->task         = __('Index all posts');
+          $this->task         = __('Index all entries for search engine');
           $this->step_task    = __('Next');
           $this->step         = __('Indexing entry %d to %d.');

plugins/maintenance/inc/tasks/class.dc.maintenance.zipmedia.php

@@ -14 +14 @@
 class dcMaintenanceZipmedia extends dcMaintenanceTask
 {
+     protected $perm = 'admin';
      protected $blog = true;
      protected $tab = 'backup';

plugins/maintenance/inc/tasks/class.dc.maintenance.ziptheme.php

@@ -14 +14 @@
 class dcMaintenanceZiptheme extends dcMaintenanceTask
 {
+     protected $perm = 'admin';
      protected $blog = true;
      protected $tab = 'backup';