Changeset 735 for trunk/Modules/Scheduler/Scheduler.php

Timestamp:

Apr 6, 2015, 1:03:33 PM (9 years ago)

Author:

chronos

Message:

• Added: Support for Internet free access. Unregistered users are redirected to activation page where they can found useful information and activate free access for 24 hours.

File:

• trunk/Modules/Scheduler/Scheduler.php (modified) (2 diffs)

trunk/Modules/Scheduler/Scheduler.php

@@ -64 +64 @@
           $DbResult = $this->Database->query('SELECT `Scheduler`.*, `SchedulerAction`.`Class` AS `Class` FROM `Scheduler` '.
                 'LEFT JOIN `SchedulerAction` ON `SchedulerAction`.`Id` = `Scheduler`.`Action` '.
-                'WHERE (`Scheduler`.`Enabled`=1) AND (`Scheduler`.`ScheduledTime` > `Scheduler`.`LastExecutedTime`)');
+                'WHERE (`Scheduler`.`Enabled`=1) AND (((`Scheduler`.`ScheduledTime` < "'.TimeToMysqlDateTime(time()).'") AND '.
+                ' (`Scheduler`.`LastExecutedTime` < `Scheduler`.`ScheduledTime`)) OR '. 
+                '(`Scheduler`.`ScheduledTime` IS NULL))');
           while($DbRow = $DbResult->fetch_assoc())
           {
@@ -76 +78 @@
                           $this->Database->update('Scheduler', 'Id='.$DbRow['Id'], 
                           array('Log' => $Output, 'LastExecutedTime' => 'NOW()'));
+                          if($DbRow['ScheduledTime'] == '') $NewScheduledTime = time() + $DbRow['Period'];
+                            else $NewScheduledTime = MysqlDateTimeToTime($DbRow['ScheduledTime']) + $DbRow['Period'];  
                         if($DbRow['Period'] != '') $this->Database->update('Scheduler', 'Id='.$DbRow['Id'],
-                                array('ScheduledTime' => TimeToMysqlDateTime((MysqlDateTimeToTime($DbRow['ScheduledTime']) + $DbRow['Period']))));                        
+                                array('ScheduledTime' => TimeToMysqlDateTime($NewScheduledTime)));                        
           }     
           echo('.');