[Phpgroupware-cvs] property/inc/class.boalarm.inc.php, 1.6

[nomail]

Update of /property/inc
Modified Files:
        Branch: 
          class.boalarm.inc.php

date: 2004/07/15 23:22:39;  author: sigurdne;  state: Exp;  lines: +9 -3

Log Message:
no message
=====================================================================
Index: property/inc/class.boalarm.inc.php
diff -u property/inc/class.boalarm.inc.php:1.5 
property/inc/class.boalarm.inc.php:1.6
--- property/inc/class.boalarm.inc.php:1.5      Tue Jul 13 20:55:26 2004
+++ property/inc/class.boalarm.inc.php  Thu Jul 15 23:22:39 2004
@@ -216,6 +216,8 @@
                                }
 */
                                $alarm['enabled'] = intval(!$alarm['enabled']);
+//_debug_array($alarm['entity_id']);
+//_debug_array($alarm);
                                if 
($this->save_alarm($alarm_type,$alarm['entity_id'],$alarm))
                                {
                                        ++$enabled;
@@ -255,6 +257,7 @@
                                $this->async->cancel_timer($id);
                        }
                        $alarm[$alarm_type.'_id'] = $entity_id;         // we 
need the back-reference
+                       $alarm['id'] = $id;
 
                        if 
(!$this->async->set_timer($alarm['time'],$id,$method,$alarm))
                        {
@@ -336,7 +339,7 @@
                function send_alarm($alarm)
                {
 
-//                     echo "<p>boalarm::send_alarm("; print_r($alarm); echo 
")</p>\n";
+       //              echo "<p>boalarm::send_alarm("; print_r($alarm); echo 
")</p>\n";
                        $GLOBALS['phpgw_info']['user']['account_id'] = 
$this->owner = $alarm['owner'];
 
                        if (!$alarm['enabled'] || !$alarm['owner'])
@@ -382,7 +385,10 @@
                        $body  = '';
                        $body .= lang('Alarm').' #'.$alarm['event_id']."\n";
                        $body .= lang('Name').': '.$alarm['event_name']."\n";
-                       $body .= lang('Deadline').': '. 
$GLOBALS['phpgw']->common->show_date(($alarm['time']+$alarm['offset'])) ."\n";
+                       if(!is_array($alarm['time']))
+                       {
+                               $body .= lang('Deadline').': '. 
$GLOBALS['phpgw']->common->show_date(($alarm['time']+$alarm['offset'])) ."\n";
+                       }
                        $body .= lang('Assigned To').': 
'.$GLOBALS['phpgw']->accounts->id2name($alarm['owner'])."\n";
 
                        // add assigned to recipients