[Fmsystem-commits] [11850] property: preserve method for cron-jobs

[Sigurd Nes]

Revision: 11850
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11850
Author:   sigurdne
Date:     2014-03-21 14:14:39 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
property: preserve method for cron-jobs

Modified Paths:
--------------
    trunk/property/inc/class.boalarm.inc.php
    trunk/property/inc/class.uialarm.inc.php

Modified: trunk/property/inc/class.boalarm.inc.php
===================================================================
--- trunk/property/inc/class.boalarm.inc.php    2014-03-21 14:13:23 UTC (rev 
11849)
+++ trunk/property/inc/class.boalarm.inc.php    2014-03-21 14:14:39 UTC (rev 
11850)
@@ -186,6 +186,7 @@
                        $alarm['id']    = $id;
                        $alarm['time']  = $jobs[$id]['next'];
                        $alarm['times'] = $jobs[$id]['times'];
+                       $alarm['method']= $jobs[$id]['method'];
 
 //                     echo "<p>read_alarm('$id')="; print_r($alarm); echo 
"</p>\n";
                        return $alarm;
@@ -225,7 +226,7 @@
  */
                                $alarm['enabled'] = intval(!$alarm['enabled']);
 
-                               if 
($this->save_alarm($alarm_type,$alarm['event_id'],$alarm))
+                               if 
($this->save_alarm($alarm_type,$alarm['event_id'],$alarm,$alarm['method']))
                                {
                                        ++$enabled;
                                }
@@ -234,12 +235,13 @@
                }
 
 
-               /*!
-               @function save_alarm
-               @abstract saves a new or updated alarm
-               @syntax save_alarm($cal_id,$alarm,$id=false)
-               @param $cal_id Id of the calendar-entry
-               @param $alarm array with fields: text, owner, enabled, ..
+               /**
+                * save_alarm
+                * @param string $alarm_type
+                * @param string $event_id
+                * @param array $alarm
+                * @param string $method
+                * @return string|boolean
                 */
                function save_alarm($alarm_type,$event_id,$alarm,$method='')
                {
@@ -360,9 +362,6 @@
                        
                        if(isset($event[$id]) && $event[$id] &&  
$event[$id]['method'] && $event[$id]['data']['enabled'])
                        {
-                               echo "execMethod({$event[$id]['method']},";
-                               _debug_array($event[$id]['data']);
-                               echo ');';
                                
execMethod($event[$id]['method'],$event[$id]['data']);
                        }
                }

Modified: trunk/property/inc/class.uialarm.inc.php
===================================================================
--- trunk/property/inc/class.uialarm.inc.php    2014-03-21 14:13:23 UTC (rev 
11849)
+++ trunk/property/inc/class.uialarm.inc.php    2014-03-21 14:14:39 UTC (rev 
11850)
@@ -51,6 +51,7 @@
                                'list_alarm'=> true,
                                'run'           => true
                        );
+               private $bo;
 
                function property_uialarm()
                {
@@ -97,9 +98,10 @@
                        {
                                $receipt = 
$this->bo->delete_alarm('fm_async',$values['alarm']);
                        }
-                       else if(($values['enable_alarm'] || 
$values['disable_alarm']) && count($values['alarm']))
+                       else if( (isset($values['enable_alarm']) && 
$values['enable_alarm']) || (isset($values['disable_alarm']) && 
$values['disable_alarm']) && count($values['alarm']))
                        {
-                               $receipt = 
$this->bo->enable_alarm('fm_async',$values['alarm'],$values['enable_alarm']);
+                               $_enable_alarm = isset($values['enable_alarm']) 
&& $values['enable_alarm'] ? true : false;
+                               $receipt = 
$this->bo->enable_alarm('fm_async',$values['alarm'],$_enable_alarm);
                        }
                        else if(isset($values['test_cron']) && 
$values['test_cron'] && isset($values['alarm']) && $values['alarm'])
                        {