Changeset 1984:0b0cb9cd7da7 for plugins/maintenance/_admin.php

Timestamp:

09/21/13 23:52:08 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Message:

Revamp plugin maintenance, step 4 bis, better place for settings according to boss and some typo, addresses #999

File:

• plugins/maintenance/_admin.php (modified) (9 diffs)

plugins/maintenance/_admin.php

@@ -23 +23 @@
 // Admin behaviors
 $core->addBehavior('dcMaintenanceRegister', array('dcMaintenanceAdmin', 'dcMaintenanceRegister'));
-$core->addBehavior('adminPreferencesHeaders', array('dcMaintenanceAdmin', 'adminPreferencesHeaders'));
 $core->addBehavior('adminDashboardFavs', array('dcMaintenanceAdmin', 'adminDashboardFavs'));
 $core->addBehavior('adminDashboardFavsIcon', array('dcMaintenanceAdmin', 'adminDashboardFavsIcon'));
 $core->addBehavior('adminDashboardItems', array('dcMaintenanceAdmin', 'adminDashboardItems'));
-$core->addBehavior('adminPreferencesForm',   array('dcMaintenanceAdmin',   'adminPreferencesForm'));
-$core->addBehavior('adminBeforeUserOptionsUpdate',     array('dcMaintenanceAdmin',   'adminBeforeUserOptionsUpdate'));
+$core->addBehavior('adminDashboardOptionsForm',   array('dcMaintenanceAdmin',   'adminDashboardOptionsForm'));
+$core->addBehavior('adminAfterDashboardOptionsUpdate', array('dcMaintenanceAdmin',   'adminAfterDashboardOptionsUpdate'));
 
 /**
@@ -60 +59 @@
 
           $tasks[] = 'dcMaintenanceCache';
+          $tasks[] = 'dcMaintenanceIndexposts';
+          $tasks[] = 'dcMaintenanceIndexcomments';
           $tasks[] = 'dcMaintenanceCountcomments';
-          $tasks[] = 'dcMaintenanceIndexcomments';
-          $tasks[] = 'dcMaintenanceIndexposts';
           $tasks[] = 'dcMaintenanceLogs';
           $tasks[] = 'dcMaintenanceVacuum';
           $tasks[] = 'dcMaintenanceZipmedia';
           $tasks[] = 'dcMaintenanceZiptheme';
-     }
-
-     /**
-      * Dashboard headers.
-      *
-      * Add ajavascript to toggle tasks list.
-      */
-     public static function adminPreferencesHeaders()
-     {
-          return dcPage::jsLoad('index.php?pf=maintenance/js/preferences.js');
      }
 
@@ -122 +111 @@
           // Check expired tasks
           $maintenance = new dcMaintenance($core);
-          $expired = $maintenance->getExpired();
-          $expired = count($expired);
-          if (!$expired) {
-               return null;
-          }
-
-          $icon[0] .= '<br />'.sprintf(__('One task to update', '%s tasks to update', $expired), $expired);
+          $count = 0;
+          foreach($maintenance->getTasks() as $t)
+          {
+               if ($t->expired() !== false){
+                    $count++;
+               }
+          }
+
+          if (!$count) {
+               return null;
+          }
+
+          $icon[0] .= '<br />'.sprintf(__('One task to execute', '%s tasks to execute', $count), $count);
      }
 
@@ -145 +140 @@
 
           $maintenance = new dcMaintenance($core);
-          $tasks = $maintenance->getExpired();
-          if (empty($tasks)) {
-               return null;
-          }
 
           $lines = array();
-          foreach($tasks as $id => $ts) {
-               $lines[$ts] = 
-               '<li title="'.sprintf(__('Last updated on %s'),
-                    dt::dt2str($core->blog->settings->system->date_format, $ts).' '.
-                    dt::dt2str($core->blog->settings->system->time_format, $ts)
-               ).'">'.$maintenance->getTask($id)->task().'</li>';
-          }
-          ksort($lines);
+          foreach($maintenance->getTasks() as $t)
+          {
+               $ts = $t->expired();
+               if ($ts === false){
+                    continue;
+               }
+
+               $lines[] = 
+               '<li title="'.($ts === null ?
+                    __('This task has never been executed.')
+                    :
+                    sprintf(__('Last execution of this task was on %s.'),
+                         dt::dt2str($core->blog->settings->system->date_format, $ts).' '.
+                         dt::dt2str($core->blog->settings->system->time_format, $ts)
+                    )
+               ).'">'.$t->task().'</li>';
+          }
+
+          if (empty($lines)) {
+               return null;
+          }
 
           $items[] = new ArrayObject(array(
                '<div id="maintenance-expired">'.
                '<h3><img src="index.php?pf=maintenance/icon.png" alt="" /> '.__('Maintenance').'</h3>'.
-               '<p>'.sprintf(__('There is a task to update.', 'There are %s tasks to update.', count($tasks)), count($tasks)).'</p>'.
+               '<p class="warn">'.sprintf(__('There is a task to execute.', 'There are %s tasks to execute.', count($lines)), count($lines)).'</p>'.
                '<ul>'.implode('',$lines).'</ul>'.
-               '<p><a href="plugin.php?p=maintenance">'.__('Manage task').'</a></p>'.
+               '<p><a href="plugin.php?p=maintenance">'.__('Manage tasks').'</a></p>'.
                '</div>'
                ));
@@ -178 +182 @@
       * @param $args     <b>object</b>  dcCore instance or record
       */
-     public static function adminPreferencesForm($core)
-     {
-          $core->auth->user_prefs->addWorkspace('maintenance');
-          $maintenance = new dcMaintenance($core);
-
-          $tasks = $maintenance->getTasks();
-          if (empty($tasks)) {
-               return null;
-          }
-
-          $full_combo_ts = array_merge(array(
-               __('Use different periods for each task') => 'seperate'), 
-               self::comboTs()
-          );
-
-          $task_combo_ts = array_merge(array(
-               __('Never') => 0), 
-               self::comboTs()
-          );
+     public static function adminDashboardOptionsForm($core)
+     {
+          $core->auth->user_prefs->addWorkspace('maintenance');
 
           echo
@@ -202 +190 @@
           '<h4>'.__('Maintenance').'</h4>'.
 
-          '<div class="two-boxes">'.
-
           '<p><label for="maintenance_dashboard_icon" class="classic">'.
           form::checkbox('maintenance_dashboard_icon', 1, $core->auth->user_prefs->maintenance->dashboard_icon).
@@ -210 +196 @@
           '<p><label for="maintenance_dashboard_item" class="classic">'.
           form::checkbox('maintenance_dashboard_item', 1, $core->auth->user_prefs->maintenance->dashboard_item).
-          __('Display list of expired tasks on dashboard contents').'</label></p>'.
-
-          '<p><label for="maintenance_plugin_message" class="classic">'.
-          form::checkbox('maintenance_plugin_message', 1, $core->auth->user_prefs->maintenance->plugin_message).
-          __('Display alert message of expired tasks on plugin page').'</label></p>'.
-
-          '</div>'.
-
-          '<div class="two-boxes">'.
-
-          '<p><label for="maintenance_recall_time">'.__('Recall time for all tasks').'</label>'.
-          form::combo('maintenance_recall_time', $full_combo_ts, 'seperate', 'recall-for-all').
-          '</p>'.
-
-          '</div>'.
-
-          '<div id="maintenance-recall-time">'.
-          '<h5>'.__('Recall time per task').'</h5>';
-
-          foreach($tasks as $task) {
-               echo
-               '<div class="two-boxes">'.
-
-               '<p><label for="maintenance_ts_'.$task->id().'">'.$task->task().'</label>'.
-               form::combo('maintenance_ts_'.$task->id(), $task_combo_ts, $task->ts(), 'recall-per-task').
-               '</p>'.
-
-               '</div>';
-          }
-
-          echo 
-          '</div>'.
+          __('Display list of expired tasks on dashboard items').'</label></p>'.
+
           '</div>';
      }
@@ -248 +204 @@
       * User preferences update.
       *
-      * @param $cur <b>cursor</b>  Cursor of user options
       * @param $user_id  <b>string</b>  User ID
       */
-     public static function adminBeforeUserOptionsUpdate($cur, $user_id=null)
+     public static function adminAfterDashboardOptionsUpdate($user_id=null)
      {
           global $core;
 
           if (is_null($user_id)) {
-               return null;
-          }
-
-          $maintenance = new dcMaintenance($core);
-          $tasks = $maintenance->getTasks();
-          if (empty($tasks)) {
                return null;
           }
@@ -268 +217 @@
           $core->auth->user_prefs->maintenance->put('dashboard_icon', !empty($_POST['maintenance_dashboard_icon']), 'boolean');
           $core->auth->user_prefs->maintenance->put('dashboard_item', !empty($_POST['maintenance_dashboard_item']), 'boolean');
-          $core->auth->user_prefs->maintenance->put('plugin_message', !empty($_POST['maintenance_plugin_message']), 'boolean');
-
-          foreach($tasks as $task) {
-               if ($_POST['maintenance_recall_time'] == 'seperate') {
-                    $ts = empty($_POST['maintenance_ts_'.$task->id()]) ? 0 : $_POST['maintenance_ts_'.$task->id()];
-               }
-               else {
-                    $ts = $_POST['maintenance_recall_time'];
-               }
-               $core->auth->user_prefs->maintenance->put('ts_'.$task->id(), abs((integer) $ts), 'integer');
-          }
-     }
-
-     /* @ignore */
-     public static function comboTs()
-     {
-          return array(
-               __('Every week')         => 604800,
-               __('Every two weeks')    => 1209600,
-               __('Every month')        => 2592000,
-               __('Every two months')   => 5184000
-          );
      }
 }