Changeset 1955:b0bef03695c0 for plugins/maintenance

Timestamp:

09/19/13 01:08:39 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Children:

1956:d272c079e6e5, 1964:bfde9296c3c5

Message:

Revamp plugin maintenance, step 3, add backup tasks, dynamic tabs and plugin importExport, addresses #999

Location:

plugins/maintenance

Files:

• _admin.php (modified) (2 diffs)
• _prepend.php (modified) (1 diff)
• inc/class.dc.maintenance.php (modified) (4 diffs)
• inc/class.dc.maintenance.task.php (modified) (3 diffs)
• inc/tasks/class.dc.maintenance.zipmedia.php (added)
• inc/tasks/class.dc.maintenance.ziptheme.php (added)
• index.php (modified) (2 diffs)

plugins/maintenance/_admin.php

@@ -43 +43 @@
       * @param $tasks    <b>arrayObject</b>  Array of tasks to register
       * @param $groups   <b>arrayObject</b>  Array of groups to register
+      * @param $tabs     <b>arrayObject</b>  Array of tabs to register
       */
-      public static function register($core, $tasks, $groups)
+      public static function register($core, $tasks, $groups, $tabs)
      {
+          $tabs['maintenance'] = __('Servicing');
+          $tabs['backup'] = __('Backup');
+
           $groups['optimize'] = __('Optimize');
           $groups['index'] = __('Count and index');
           $groups['purge'] = __('Purge');
           $groups['other'] = __('Other');
+          $groups['zipblog'] = __('Compressed file for current blog');
+          $groups['zipfull'] = __('Compressed file for all blogs');
 
           $tasks[] = 'dcMaintenanceCache';
@@ -57 +63 @@
           $tasks[] = 'dcMaintenanceLogs';
           $tasks[] = 'dcMaintenanceVacuum';
+          $tasks[] = 'dcMaintenanceZipmedia';
+          $tasks[] = 'dcMaintenanceZiptheme';
      }
 

plugins/maintenance/_prepend.php

@@ -24 +24 @@
 $__autoload['dcMaintenanceLogs'] = dirname(__FILE__).'/inc/tasks/class.dc.maintenance.logs.php';
 $__autoload['dcMaintenanceVacuum'] = dirname(__FILE__).'/inc/tasks/class.dc.maintenance.vacuum.php';
+$__autoload['dcMaintenanceZipmedia'] = dirname(__FILE__).'/inc/tasks/class.dc.maintenance.zipmedia.php';
+$__autoload['dcMaintenanceZiptheme'] = dirname(__FILE__).'/inc/tasks/class.dc.maintenance.ziptheme.php';
 
 $this->core->rest->addFunction('dcMaintenanceStep', array('dcMaintenanceRest', 'step'));

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

@@ -27 +27 @@
      private $core;
      private $tasks = array();
+     private $tabs = array();
      private $groups = array();
 
@@ -41 +42 @@
 
           $tasks = new ArrayObject();
+          $tabs = new ArrayObject();
           $groups = new ArrayObject();
 
           # --BEHAVIOR-- dcMaintenanceRegister
-          $core->callBehavior('dcMaintenanceRegister', $core, $tasks, $groups);
-
-          $this->init($tasks, $groups);
+          $core->callBehavior('dcMaintenanceRegister', $core, $tasks, $groups, $tabs);
+
+          $this->init($tasks, $groups, $tabs);
      }
 
@@ -54 +56 @@
       * @param tasks     <b>arrayObject</b>  Array of task to register
       * @param groups    <b>arrayObject</b>  Array of groups to add
-      */
-     public function init($tasks, $groups)
+      * @param tabs <b>arrayObject</b>  Array of tabs to add
+      */
+     public function init($tasks, $groups, $tabs)
      {
           $this->tasks = $this->groups = array();
@@ -79 +82 @@
                $this->groups[(string) $id] = (string) $name;
           }
+
+          foreach($tabs as $id => $name)
+          {
+               $this->tabs[(string) $id] = (string) $name;
+          }
+     }
+
+     /**
+      * Get a tab name.
+      *
+      * @param id   <b>string</b> Tab ID
+      * @return     <b>mixed</b> tab name or null if not exists
+      */
+     public function getTab($id)
+     {
+          return array_key_exists($id, $this->tabs) ? $this->tabs[$id] : null;
+     }
+
+     /**
+      * Get tabs.
+      *
+      * @return     <b>array</b> Array of tabs ID and name
+      */
+     public function getTabs()
+     {
+          return $this->tabs;
      }
 

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

@@ -28 +28 @@
      protected $id;
      protected $name;
+     protected $tab = 'maintenance';
      protected $group = 'other';
 
@@ -115 +116 @@
 
      /**
+      * Get task tab.
+      *
+      * @return     <b>mixed</b>   Task tab ID or null
+      */
+     public function tab()
+     {
+          return $this->tab;
+     }
+
+     /**
       * Get task group.
       *
@@ -211 +222 @@
           return null;
      }
+
+     /**
+      * Log task execution.
+      *
+      * Sometimes we need to log task execution 
+      * direct from task itself.
+      *
+      */
+     protected function log()
+     {
+          $maintenance = new dcMaintenance($this->core);
+          $maintenance->setLog($this->id);
+     }
 }

plugins/maintenance/index.php

@@ -70 +70 @@
 dcPage::jsPageTabs($tab);
 
-if ($task) {
+if (0){//$task) {
      echo 
      '<script type="text/javascript">'."\n".
@@ -137 +137 @@
      // Simple task (with only a button to start it)
 
-     echo 
-     '<div id="maintenance" class="multi-part" title="'.__('Maintenance').'">'.
-     '<h3>'.__('Maintenance').'</h3>'.
-     '<form action="'.$p_url.'" method="post">';
-
-     foreach($maintenance->getGroups($core) as $g_id => $g_name)
+     foreach($maintenance->getTabs() as $tab_id => $tab_name)
      {
-          $res = '';
-          foreach($maintenance->getTasks($core) as $t)
+          $res_group = '';
+          foreach($maintenance->getGroups($core) as $group_id => $group_name)
           {
-               if ($t->group() != $g_id) {
-                    continue;
+               $res_task = '';
+               foreach($maintenance->getTasks($core) as $t)
+               {
+                    if ($t->group() != $group_id || $t->tab() != $tab_id) {
+                         continue;
+                    }
+
+                    $res_task .=  
+                    '<p>'.form::radio(array('task', $t->id()), $t->id()).' '.
+                    '<label class="classic" for="'.$t->id().'">'.
+                    html::escapeHTML($t->task()).'</label>';
+
+                    if (array_key_exists($t->id(), $expired)) {
+                         $res_task .= 
+                         ' <span class="clear form-note warn">'.sprintf(
+                              __('Last execution of this task was on %s. You should execute it again.'),
+                              dt::dt2str(__('%Y-%m-%d %H:%M'), $expired[$t->id()])
+                         ).'</span>';
+                    }
+
+                    $res_task .= '</p>';
                }
 
-               $res .=  
-               '<p>'.form::radio(array('task', $t->id()), $t->id()).' '.
-               '<label class="classic" for="'.$t->id().'">'.
-               html::escapeHTML($t->task()).'</label>';
-
-               if (array_key_exists($t->id(), $expired)) {
-                    $res .= 
-                    ' <span class="clear form-note warn">'.sprintf(
-                         __('Last execution of this task was on %s. You should execute it again.'),
-                         dt::dt2str(__('%Y-%m-%d %H:%M'), $expired[$t->id()])
-                    ).'</span>';
+               if (!empty($res_task)) {
+                    $res_group .= 
+                    '<div class="fieldset">'.
+                    '<h4 id="'.$group_id.'">'.$group_name.'</h4>'.
+                    $res_task.
+                    '</div>';
                }
-
-               $res .= '</p>';
-          }
-
-          if (!empty($res)) {
-               echo '<div class="fieldset"><h4 id="'.$g_id.'">'.$g_name.'</h4>'.$res.'</div>';
-          }
-     }
-
-     echo 
-     '<p><input type="submit" value="'.__('Execute task').'" /> '.
-     form::hidden(array('tab'), 'maintenance').
-     $core->formNonce().'</p>'.
-     '<p class="form-note info">'.__('This may take a very long time').'.</p>'.
-     '</form>'.
-     '</div>';
+          }
+
+          if (!empty($res_group)) {
+               echo 
+               '<div id="'.$tab_id.'" class="multi-part" title="'.$tab_name.'">'.
+               '<h3>'.$tab_name.'</h3>'.
+               '<form action="'.$p_url.'" method="post">'.
+               $res_group.
+               '<p><input type="submit" value="'.__('Execute task').'" /> '.
+               form::hidden(array('tab'), $tab_id).
+               $core->formNonce().'</p>'.
+               '<p class="form-note info">'.__('This may take a very long time').'.</p>'.
+               '</form>'.
+               '</div>';
+          }
+     }
 
      // Advanced tasks (that required a tab)