Changeset 22

Timestamp:

05/03/07 08:54:13 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/calendar

Files:

• doc/change_log.txt (modified) (1 diff)
• inc/class.uialarm.inc.php (modified) (1 diff)
• inc/class.uicalendar.inc.php (modified) (2 diffs)
• setup/phpgw_en.lang (modified) (previous)

trunk/calendar/doc/change_log.txt

@@ -2 +2 @@
 módulo Agenda de Eventos, e a partir da versão 29/11/2006 [0.9.17]
 Nilton Emilio Buhrer Neto.
+
+03/05/2007 - [0.9.2]
+- Corrigido bug que possibilita adicionar 2 alarmes no mesmo evento no mesmo horário.
 
 02/05/2007 - [0.9.2]

trunk/calendar/inc/class.uialarm.inc.php

@@ -122 +122 @@
                         if ($_POST['add'])
                         {
+                                // Unix time format of event start
+                                $start_event=mktime( $this->bo->bo->so->cal->event['start']['hour'] ,
+                                                                         $this->bo->bo->so->cal->event['start']['min'] ,
+                                                                         $this->bo->bo->so->cal->event['start']['sec'] ,
+                                                                         $this->bo->bo->so->cal->event['start']['month'] ,
+                                                                         $this->bo->bo->so->cal->event['start']['mday'],
+                                                                         $this->bo->bo->so->cal->event['start']['year'] );
                                 $time = (int)($_POST['time']['days'])*24*3600 +
                                         (int)($_POST['time']['hours'])*3600 +
                                         (int)($_POST['time']['mins'])*60;
+                                $alarm_time = $start_event - $time;
+                                
+                                foreach ( $this->bo->bo->so->cal->event['alarm'] as $object ){
+                                        if ($object['time'] == $alarm_time)
+                                        {
+                                                echo '<center>'.lang('Alarm already added!!!').'</center>';
+                                                $GLOBALS['phpgw']->common->phpgw_exit(True);
+                                        }
+                                }
 
                                 if ($time > 0 && !$this->bo->add($this->event,$time,$_POST['owner']))

trunk/calendar/inc/class.uicalendar.inc.php

@@ -3396 +3396 @@
                         }
                         $vars['participants']['data'] = implode("<br>\n",$vars['participants']['data']);
-
                         foreach($vars as $var)
                         {
@@ -3410 +3409 @@
                                 $p->set_var('hr_text',lang('Alarms'));
                                 $p->parse('row','hr',True);
-
                                 foreach($event['alarm'] as $key => $alarm)
                                 {
-                                        if ($this->bo->so->owner == $alarm['owner']) // Show only alert from user who is requesting
+                                        if (($this->bo->so->owner == $alarm['owner']) || ($this->bo->so->cal->event['owner'] == $this->bo->so->owner)) // Show only alert from user who is requesting or alert owner
                                         {       
                                                 $icon = '<img src="'.$GLOBALS['phpgw']->common->image('calendar',($alarm['enabled']?'enabled':'disabled')).'" width="13" height="13">';