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

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

@@ -21 +21 @@
 class dcMaintenanceTask
 {
+     protected $maintenance;
      protected $core;
      protected $p_url;
      protected $code;
-     protected $ts = 604800; // one week
+     protected $ts = 0;
+     protected $expired = 0;
      protected $ajax = false;
+     protected $blog = false;
 
      protected $id;
@@ -43 +46 @@
       * use method init() to do it.
       *
-      * @param core <b>dcCore</b>  dcCore instance
+      * @param maintenance    <b>dcMaintenance</b>     dcMaintenance instance
       * @param p_url     <b>string</b>  Maintenance plugin url
       */
-     public function __construct($core, $p_url)
-     {
-          $this->core =& $core;
+     public function __construct($maintenance, $p_url)
+     {
+          $this->maintenance = $maintenance;
+          $this->core = $maintenance->core;
           $this->init();
 
@@ -64 +68 @@
           }
 
-          $core->auth->user_prefs->addWorkspace('maintenance');
-          $ts = $core->auth->user_prefs->maintenance->get('ts_'.$this->id);
-          
+          $this->core->blog->settings->addNamespace('maintenance');
+          $ts = $this->core->blog->settings->maintenance->get('ts_'.$this->id);
+
           $this->ts = abs((integer) $ts);
      }
@@ -99 +103 @@
      {
           return $this->ts === false ? false : abs((integer) $this->ts);
+     }
+
+     /**
+      * Get task expired.
+      *
+      * This return:
+      * - Timstamp of last update if it expired
+      * - False if it not expired or has no recall time
+      * - Null if it has never been executed
+      *
+      * @return     <b>mixed</b>   Last update
+      */
+     public function expired()
+     {
+          if ($this->expired === 0) {
+               if (!$this->ts()) {
+                    $this->expired = false;
+               }
+               else {
+                    $this->expired = null;
+                    $logs = array();
+                    foreach($this->maintenance->getLogs() as $id => $log)
+                    {
+                         if ($id != $this->id() || $this->blog && !$log['blog']) {
+                              continue;
+                         }
+
+                         $this->expired = $log['ts'] + $this->ts() < time() ? $log['ts'] : false;
+                    }
+               }
+          }
+          return $this->expired;
      }
 
@@ -251 +287 @@
      protected function log()
      {
-          $maintenance = new dcMaintenance($this->core);
-          $maintenance->setLog($this->id);
+          $this->maintenance->setLog($this->id);
      }
 }