[Phpgroupware-cvs] calendar/inc class.uialarm.inc.php,1.4.2.1.2.5

[skwashd]

Update of calendar/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.uialarm.inc.php lines: +12 -10

Log Message:
fix for bug #7817, backported from HEAD

====================================================
Index: calendar/inc/class.uialarm.inc.php
diff -u calendar/inc/class.uialarm.inc.php:1.4.2.1.2.4 
calendar/inc/class.uialarm.inc.php:1.4.2.1.2.5
--- calendar/inc/class.uialarm.inc.php:1.4.2.1.2.4      Fri Nov 18 13:40:20 2005
+++ calendar/inc/class.uialarm.inc.php  Tue Dec  6 09:06:07 2005
@@ -55,7 +55,7 @@
                {
                        $this->event = $this->bo->read_entry($this->bo->cal_id);

-                       if ( !$this->bo->cal_id || !$this->event )
+                       if ( !$this->bo->cal_id || !is_array($this->event) )
                        {
                                $GLOBALS['phpgw']->redirect_link('/index.php', 
array
                                                                        (
@@ -98,7 +98,8 @@

                function manager()
                {
-                       if ($_POST['delete'] && count($_POST['alarm']))
+                       if ( isset($_POST['delete']) && $_POST['delete']
+                               && isset($_POST['alarm']) && 
is_array($_POST['alarm']) && count($_POST['alarm']) )
                        {
                                if ($this->bo->delete($_POST['alarm']) < 0)
                                {
@@ -106,7 +107,8 @@
                                        
$GLOBALS['phpgw']->common->phpgw_exit(True);
                                }
                        }
-                       if (($_POST['enable'] || $_POST['disable']) && 
count($_POST['alarm']))
+                       if ( ( (isset($_POST['enable']) && $_POST['enable']) || 
(isset($_POST['disable']) && $_POST['disable']) )
+                               && count($_POST['alarm'] ) )
                        {
                                if 
($this->bo->enable($_POST['alarm'],$_POST['enable']) < 0)
                                {
@@ -116,7 +118,7 @@
                        }
                        $this->prep_page();

-                       if ($_POST['add'])
+                       if ( isset($_POST['add']) && $_POST['add'] != '')
                        {
                                $time = intval($_POST['time']['days'])*24*3600 +
                                        intval($_POST['time']['hours'])*3600 +
@@ -133,19 +135,19 @@
                                echo '<center>'.lang('You do not have 
permission to read this record!').'</center>';
                                $GLOBALS['phpgw']->common->phpgw_exit(True);
                        }
-                       echo "<br />\n";
+
                        
$GLOBALS['phpgw']->template->set_var('th_bg',$this->theme['th_bg']);
                        
$GLOBALS['phpgw']->template->set_var('hr_text',lang('Alarms').':');
                        $GLOBALS['phpgw']->template->fp('row','hr',True);
                        
$GLOBALS['phpgw']->template->pfp('phpgw_body','view_event');

                        $var = Array(
-                               'tr_color'              => 
$this->theme['th_bg'],
+                               'tr_color'      => $this->theme['th_bg'],
                                'action_url'    => 
$GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uialarm.manager')),
                                'hidden_vars'   => 
$this->html->input_hidden('cal_id',$this->bo->cal_id),
                                'lang_select'   => lang('Select'),
-                               'lang_time'             => lang('Time'),
-                               'lang_text'             => lang('Text'),
+                               'lang_time'     => lang('Time'),
+                               'lang_text'     => lang('Text'),
                                'lang_owner'    => lang('Owner'),
                                'lang_enabled'  => lang('enabled'),
                                'lang_disabled' => lang('disabled'),
@@ -158,7 +160,7 @@

                                foreach($this->event['alarm'] as $key => $alarm)
                                {
-                                       if 
(!$this->bo->check_perms(PHPGW_ACL_READALARM,$alarm['owner']))
+                                       if 
(!$this->bo->check_perms(PHPGW_ACL_READALARM, $alarm['owner']))
                                        {
                                                continue;
                                        }