Changeset 1351 for branches/1.2/content/plugins

Timestamp:

03/19/10 04:09:05 (3 years ago)

Author:

shibuya246

Message:

[branch 1.2] fix for update cron hook, included install default cron jobs, after checking for admin_settings

File:

• branches/1.2/content/plugins/cron/cron.php (modified) (7 diffs)

branches/1.2/content/plugins/cron/cron.php

@@ -44 +44 @@
         $hook = "cron_hotaru_version";
         $this->cron_schedule_event($h, $timestamp, $recurrence, $hook);
+
+        if (SYS_FEEDBACK == 'true') {
+            $hook = "cron_hotaru_feedback";
+            $this->cron_schedule_event($h, $timestamp, $recurrence, $hook);
+        }
     }  
 
@@ -377 +382 @@
     }
 
+    public function cron_hotaru_feedback($h) {
+        $query_vals = array(
+            'api_key' => '',
+            'format' => 'json',
+            'method' => 'hotaru.systemFeedback.add',
+            'version' => $h->version
+        );
+
+       $info = $this->sendApiRequest($h, $query_vals);
+        
+    }
+
     public function cron_hotaru_version($h) {
         $query_vals = array(
@@ -384 +401 @@
         );
 
+         $info = $this->sendApiRequest($h, $query_vals);
+       
+        // save the updated version number to the local db so we can display it on the admin panel until it gets updated.        
+         if (isset($info['version']))
+             $h->updateSetting('hotaru_latest_version', serialize($info), 'cron');
+    }
+
+    public function sendApiRequest($h, $query_vals) {
+
         // Generate the POST string
         $ret = '';
@@ -398 +424 @@
         $response = curl_exec($ch);
         curl_close ($ch);
-       
-        $info = json_decode($response, true);
-       
-        // save the updated version number to the local db so we can display it on the admin panel until it gets updated.        
-         if (isset($info['version']))
-             $h->updateSetting('hotaru_latest_version', serialize($info), 'cron');
-    }
+
+       return json_decode($response, true);
+    }
+
 
     public function checkrunCron($h) {
@@ -444 +467 @@
     {
         $h->vars['cron_settings'] = $h->getSerializedSettings();
-
-        $timestamp = $cron_data['timestamp'];
-        $recurrence = $cron_data['recurrence'];
-        $hook = $cron_data['hook'];
-        $args = $cron_data['args'];
-        $id = $cron_data['args']['id'];
+        
+        $timestamp = (isset($cron_data['timestamp'])) ? $cron_data['timestamp'] : array();
+        $recurrence = (isset($cron_data['recurrence'])) ? $cron_data['recurrence'] : array();
+        $hook = (isset($cron_data['hook'])) ? $cron_data['hook'] : array();
+        $args = (isset($cron_data['args'])) ? $cron_data['args'] : array();
         $cron_exists = false;
 
-         // check whether already have existing event for this job
+        // check whether already have existing event for this job
         //  match against hook and args. note args must match
         $current_crons = $this->_get_cron_array($h);
         foreach ($current_crons as $current_timestamp => $current_cronhooks) {
           foreach ($current_cronhooks as $current_hook => $current_keys) {
-            if ($current_hook == $hook && $current_keys = $args) {
+             if ($current_hook == $hook) {
+               foreach ($current_keys as $current_md5 => $current_job) {
+              //print_r( $current_job["args"]); print "   **    "; print_r($args);
+            if ($current_job["args"] == $args) {
                 $this->cron_schedule_event($h, $timestamp, $recurrence, $hook, $args);
                 $this->cron_unschedule_event($h, $current_timestamp, $current_hook, $args);
                 $cron_exists = true;
-            }
+            }}}
           }
         }
@@ -471 +496 @@
     {        
         //load current cron jobs from memory space
-        $h->vars['cron_settings'] = $h->getSerializedSettings();
-        
-        $hook = $cron_data['hook'];
-        $args = $cron_data['args'];
+        $h->vars['cron_settings'] = $h->getSerializedSettings();        
+       
+        $hook = (isset($cron_data['hook'])) ? $cron_data['hook'] : array();
+        $args = (isset($cron_data['args'])) ? $cron_data['args'] : array();
 
         $current_crons = $this->_get_cron_array($h);
@@ -495 +520 @@
         $h->vars['cron_settings'] = $h->getSerializedSettings();
 
-        $hook = $cron_data['hook'];
+        $hook = (isset($cron_data['hook'])) ? $cron_data['hook'] : array();
         $flush_count = 0;