fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [17138] api: fix run for deactivated cron-jobs


From: sigurdne
Subject: [Fmsystem-commits] [17138] api: fix run for deactivated cron-jobs
Date: Thu, 5 Oct 2017 05:36:41 -0400 (EDT)

Revision: 17138
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17138
Author:   sigurdne
Date:     2017-10-05 05:36:41 -0400 (Thu, 05 Oct 2017)
Log Message:
-----------
api: fix run for deactivated cron-jobs

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.asyncservice.inc.php
    trunk/property/inc/cron/class.cron_parent.inc.php

Modified: trunk/phpgwapi/inc/class.asyncservice.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.asyncservice.inc.php       2017-10-05 09:35:38 UTC 
(rev 17137)
+++ trunk/phpgwapi/inc/class.asyncservice.inc.php       2017-10-05 09:36:41 UTC 
(rev 17138)
@@ -436,6 +436,7 @@
                                                                echo "--data: ";
                                                                
print_r($job['data']);
                                                                echo "\n";
+                                                               
$job['data']['cron'] = true;
                                                        }
                                                        
ExecMethod($job['method'],$job['data']);
 

Modified: trunk/property/inc/cron/class.cron_parent.inc.php
===================================================================
--- trunk/property/inc/cron/class.cron_parent.inc.php   2017-10-05 09:35:38 UTC 
(rev 17137)
+++ trunk/property/inc/cron/class.cron_parent.inc.php   2017-10-05 09:36:41 UTC 
(rev 17138)
@@ -51,6 +51,7 @@
 
                function pre_run( $data = array() )
                {
+                       $this->cron = !empty($data['cron']) ? true : false;
                        if (isset($data['enabled']) && $data['enabled'] == 1)
                        {
                                $confirm = true;
@@ -82,7 +83,7 @@
                                        $this->confirm($execute = false);
                                }
                        }
-                       else
+                       else if (!$this->cron)
                        {
                                $this->confirm($execute = false);
                        }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]