Changeset 1984:0b0cb9cd7da7 for plugins/maintenance/inc/class.dc.maintenance.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/inc/class.dc.maintenance.php (modified) (4 diffs)

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

@@ -25 +25 @@
 class dcMaintenance
 {
-     private $core;
+     public $core;
      private $tasks = array();
      private $tabs = array();
      private $groups = array();
+     private $logs = null;
 
      /**
@@ -44 +45 @@
           $tabs = new ArrayObject();
           $groups = new ArrayObject();
+          $logs = $this->getLogs();
 
           # --BEHAVIOR-- dcMaintenanceRegister
@@ -75 +77 @@
                }
 
-               $this->tasks[$task] = new $task($this->core, 'plugin.php?p=maintenance');
+               $this->tasks[$task] = new $task($this, 'plugin.php?p=maintenance');
           }
 
@@ -230 +232 @@
 
      /**
-      * Get expired tasks.
-      *
-      * @return     <b>array</b>   Array of expired Task ID / date
-      */
-     public function getExpired()
-     {
-          // Retrieve logs from this task
-          $rs = $this->core->log->getLogs(array(
-               'log_table' => 'maintenance',
-               'blog_id' => 'all'
-          ));
-
-          $logs = array();
-          while ($rs->fetch()) {
-               // Check if task exists
-               if (($task = $this->getTask($rs->log_msg)) !== null) {
-                    // Check if remider is used and tasks expired
-                    if ($task->ts() && strtotime($rs->log_dt) + $task->ts() < time()) {
-                         $logs[$rs->log_msg] = $rs->log_dt;
-                    }
+      * Get logs
+      *
+      * Return array(
+      *        task id => array(
+      *             timestamp of last execution,
+      *             logged on current blog or not
+      *        )
+      * )
+      *
+      * @return     <b>array</b> List of logged tasks
+      */
+     public function getLogs()
+     {
+          if ($this->logs === null) {
+               $rs = $this->core->log->getLogs(array(
+                    'log_table' => 'maintenance',
+                    'blog_id' => 'all'
+               ));
+
+               $this->logs = array();
+               while ($rs->fetch()) {
+                    $this->logs[$rs->log_msg] = array(
+                         'ts' => strtotime($rs->log_dt),
+                         'blog' => $rs->blog_id == $this->core->blog->id
+                    );
                }
           }
-          return $logs;
+
+          return $this->logs;
      }
 }