[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar inc/class.boalarm.inc.php inc/class.bo...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] calendar inc/class.boalarm.inc.php inc/class.bo... |
|
Date: |
Fri, 08 Dec 2006 11:37:55 +0000 |
CVSROOT: /sources/phpgroupware
Module name: calendar
Changes by: Sigurd Nes <sigurdne> 06/12/08 11:37:54
Modified files:
inc : class.boalarm.inc.php class.bocalendar.inc.php
class.boicalendar.inc.php class.html.inc.php
class.socalendar_sql.inc.php
class.uialarm.inc.php class.uicalendar.inc.php
templates/base : alarm.tpl
Log message:
various fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.boalarm.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.boicalendar.inc.php?cvsroot=phpgroupware&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.html.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar_sql.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uialarm.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.134&r2=1.135
http://cvs.savannah.gnu.org/viewcvs/calendar/templates/base/alarm.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
Patches:
Index: inc/class.boalarm.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.boalarm.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- inc/class.boalarm.inc.php 15 May 2005 06:57:37 -0000 1.7
+++ inc/class.boalarm.inc.php 8 Dec 2006 11:37:54 -0000 1.8
@@ -12,10 +12,10 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.boalarm.inc.php,v 1.7 2005/05/15 06:57:37 skwashd Exp $ */
+ /* $Id: class.boalarm.inc.php,v 1.8 2006/12/08 11:37:54 sigurdne Exp $
*/
define('PHPGW_ACL_DELETEALARM',PHPGW_ACL_DELETE); // for now
- define('PHPGW_ACL_SETALARM',PHPGW_ACL_WRITE);
+ define('PHPGW_ACL_SETALARM',PHPGW_ACL_ADD);
define('PHPGW_ACL_READALARM',PHPGW_ACL_READ);
class boalarm
@@ -43,7 +43,7 @@
}
$this->bo = CreateObject('calendar.bocalendar',1);
$this->so = CreateObject('calendar.socalendar',1);
- $this->tz_offset = $this->bo->datetime->tz_offset;
+ $this->tz_offset =
$GLOBALS['phpgw']->datetime->tz_offset;
if($this->debug)
{
Index: inc/class.bocalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- inc/class.bocalendar.inc.php 7 Dec 2006 20:34:27 -0000 1.115
+++ inc/class.bocalendar.inc.php 8 Dec 2006 11:37:54 -0000 1.116
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.bocalendar.inc.php,v 1.115 2006/12/07 20:34:27 sigurdne
Exp $ */
+ /* $Id: class.bocalendar.inc.php,v 1.116 2006/12/08 11:37:54 sigurdne
Exp $ */
class bocalendar
{
@@ -511,14 +511,14 @@
$this->filter = $data['filter'];
$this->cat_id = $data['cat_id'];
- $this->sortby = $data['sortby'];
+ $this->sortby = (isset($data['sortby']) &&
$data['sortby']? $data['sortby']:'');
$this->owner = intval($data['owner']);
- $this->save_owner = intval($data['save_owner']);
+ $this->save_owner =
(isset($data['save_owner'])?intval($data['save_owner']):0) ;
$this->year = intval($data['year']);
$this->month = intval($data['month']);
$this->day = intval($data['day']);
- $this->num_months = intval($data['num_months']);
- $this->return_to = $data['return_to'];
+ $this->num_months =
(isset($data['num_months'])?intval($data['num_months']):0);
+ $this->return_to =
(isset($data['return_to'])?$data['return_to']:'');
}
function read_entry($id = 0)
@@ -1751,7 +1751,7 @@
}
}
}
- if($this->cached_events[$date] && $inserted == False)
+ if(isset($this->cached_events[$date]) &&
$this->cached_events[$date] && $inserted == False)
{
if($this->debug)
Index: inc/class.boicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.boicalendar.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- inc/class.boicalendar.inc.php 10 Nov 2006 13:34:30 -0000 1.35
+++ inc/class.boicalendar.inc.php 8 Dec 2006 11:37:54 -0000 1.36
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
-/* $Id: class.boicalendar.inc.php,v 1.35 2006/11/10 13:34:30 sigurdne Exp $ */
+/* $Id: class.boicalendar.inc.php,v 1.36 2006/12/08 11:37:54 sigurdne Exp $ */
define('FOLD_LENGTH',75);
@@ -30,12 +30,13 @@
define('UNKNOWN',16);
define('NEEDS_ACTION',0);
-define('ACCEPTED',1);
+define('ACCEPTEDSTAT',1); // old name was ACCEPTED - but it is already defined
as 3 in socalendar__
define('DECLINED',2);
-define('TENTATIVE',3);
+define('TENTATIVESTAT',3); // old name was TENTATIVE - but it is already
defined as 2 in socalendar__
define('DELEGATED',4);
define('COMPLETED',5);
define('IN_PROCESS',6);
+define('MCAL_RECUR_YEARLY_WDAY',4); // this one is also defined in
socalendar__ - but somehow "undefined"
/*
* Class
@@ -64,7 +65,7 @@
define('FREE',0);
define('BUSY',1);
define('BUSY_UNAVAILABLE',2);
-define('BUSY_TENTATIVE',3);
+define('BUSY_TENTATIVESTAT',3);
define('THISANDPRIOR',0);
define('THISANDFUTURE',1);
@@ -1685,7 +1686,7 @@
reset($this->parameter);
while(list($key,$param_array) = each($this->parameter))
{
- if($param_array['properties'][$property])
+ if(isset($param_array['properties'][$property]) &&
$param_array['properties'][$property])
{
$param[] = $key;
$this->debug('Property : '.$property.' =
Parameter : '.$key);
@@ -1709,7 +1710,7 @@
reset($this->property);
while(list($key,$param_array) = each($this->property))
{
- if($param_array[$ical_type])
+ if(isset($param_array[$ical_type]) &&
$param_array[$ical_type])
{
$prop[] = $key;
}
@@ -1883,7 +1884,7 @@
$var = array();
$this->debug('Mode : '.$mode.' Majortype : '.$majortype);
$this->parse_parameters($var,$majortype,$value);
- if ( isset($this->property[$majortype][$mode]['multiples']) &&
$this->property[$majortype][$mode]['multipass'] )
+ if ( isset($this->property[$majortype][$mode]['multiples']) &&
isset($this->property[$majortype][$mode]['multipass']) &&
$this->property[$majortype][$mode]['multipass'] )
{
$this->debug(_debug_array($var,False));
$event[$majortype][] = $var;
@@ -2040,7 +2041,7 @@
{
$key = 'mailto';
$function =
$this->parameter[$key]['function'];
- $ret_value =
$this->$function($event[$key]);
+ $ret_value =
$this->$function((isset($event[$key])?$event[$key]:''));
$str .= ($ret_value?':'.$ret_value:'');
$str .= "\r\n";
}
@@ -2105,6 +2106,8 @@
$prop = array();
}
+ $str ='';
+
foreach ( $prop as $value )
{
$varray =& $this->property[$value];
@@ -2152,7 +2155,7 @@
{
for($i=0;$i<count($event[$value]);$i++)
{
- $str .=
$this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$value));
+ $str .=
$this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters((isset($event[$value][$i])?$event[$value][$i]:''),$value));
}
}
else
@@ -2223,7 +2226,7 @@
}
break;
case 'cal-address':
- if(is_array($event[$value][0]))
+ if(isset($event[$value][0]) &&
is_array($event[$value][0]))
{
for($j=0;$j<count($event[$value]);$j++)
{
@@ -2236,7 +2239,7 @@
}
else
{
- $temp_output =
$this->build_parameters($event[$value],$value);
+ $temp_output =
$this->build_parameters((isset($event[$value])?$event[$value]:''),(isset($value)?$value:''));
if($temp_output)
{
$str .=
$this->fold(strtoupper(str_replace('_','-',$value)).$temp_output);
@@ -2265,7 +2268,7 @@
}
}
}
- elseif($event['alarm'])
+ elseif(isset($event['alarm']) && $event['alarm'])
{
for($k=0;$k<count($event['alarm']);$k++)
{
@@ -2523,8 +2526,8 @@
case 'BUSY-UNAVAILABLE':
return BUSY_UNAVAILABLE;
break;
- case 'BUSY-TENTATIVE':
- return BUSY_TENTATIVE;
+ case 'BUSY-TENTATIVESTAT':
+ return BUSY_TENTATIVESTAT;
break;
default:
return OTHER;
@@ -2544,8 +2547,8 @@
case BUSY_UNAVAILABLE:
return 'BUSY-UNAVAILABLE';
break;
- case BUSY_TENTATIVE:
- return 'BUSY-TENTATIVE';
+ case BUSY_TENTATIVESTAT:
+ return 'BUSY-TENTATIVESTAT';
break;
default:
return 'OTHER';
@@ -2664,14 +2667,14 @@
case 'NEEDS-ACTION':
return 0; // NEEDS_ACTION;
break;
- case 'ACCEPTED':
- return 1; // ACCEPTED;
+ case 'ACCEPTEDSTAT':
+ return 1; // ACCEPTEDSTAT;
break;
case 'DECLINED':
return 2; // DECLINED;
break;
- case 'TENTATIVE':
- return 3; // TENTATIVE;
+ case 'TENTATIVESTAT':
+ return 3; // TENTATIVESTAT;
break;
case 'DELEGATED':
return 4; // DELEGATED;
@@ -2694,14 +2697,14 @@
case 0: // NEEDS_ACTION:
return 'NEEDS-ACTION';
break;
- case 1: // ACCEPTED:
- return 'ACCEPTED';
+ case 1: // ACCEPTEDSTAT:
+ return 'ACCEPTEDSTAT';
break;
case 2: // DECLINED:
return 'DECLINED';
break;
- case 3: // TENTATIVE:
- return 'TENTATIVE';
+ case 3: // TENTATIVESTAT:
+ return 'TENTATIVESTAT';
break;
case 4: // DELEGATED:
return 'DELEGATED';
@@ -3929,10 +3932,10 @@
if ( isset($params['chunk_split']) )
{
$this->chunk_split = $params['chunk_split'];
- $method = ($params['method'] ? $params['method'] :
'publish');
+ $method = (isset($params['method']) &&
$params['method'] ? $params['method'] : 'publish');
}
- $method = ($params['method'] ? $params['method'] : "publish");
+ $method = (isset($params['method']) && $params['method'] ?
$params['method'] : "publish");
$string_array = array
(
@@ -4038,7 +4041,7 @@
}
$ical_temp = Array();
$ical_temp['action']['value'] =
'DISPLAY';
- $ical_temp['description']['value'] =
$alarm['text'];
+ $ical_temp['description']['value'] =
(isset($alarm['text'])?$alarm['text']:'');
$this->set_var($ical_temp['trigger'],
'value', 'VALUE=DATE-TIME:' . date('Ymd\THis\Z', $alarm['time']), 'valarm');
$ical_event['alarm'][] = $ical_temp;
}
@@ -4215,11 +4218,13 @@
$str .= 'FREQ=YEARLY;BYMONTH='
. $event['start']['month'] . ';BYDAY=' . $weekdaycount . $weekday;
break;
}
- if($event['recur_interval'])
+ if(isset($event['recur_interval']) &&
$event['recur_interval'])
{
$str .=
';INTERVAL='.$event['recur_interval'];
}
- if($event['recur_enddate']['month'] != 0 &&
$event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['year'] != 0)
+ if((isset($event['recur_enddate']['month']) &&
$event['recur_enddate']['month'] != 0)
+ &&
(isset($event['recur_enddate']['mday']) && $event['recur_enddate']['mday'] != 0)
+ &&
(isset($event['recur_enddate']['year']) && $event['recur_enddate']['year'] !=
0))
{
$recur_mktime =
$so_event->maketime($event['recur_enddate']) -
$GLOBALS['phpgw']->datetime->tz_offset;
$str .=
';UNTIL='.date('Ymd\THis\Z',$recur_mktime);
@@ -4236,7 +4241,7 @@
}
}
- $rdate = $event['recur_date'];
+ $rdate =
(isset($event['recur_date'])?$event['recur_date']:'');
if(is_array($rdate))
{
@reset($rdate);
Index: inc/class.html.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.html.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- inc/class.html.inc.php 7 Dec 2005 03:21:04 -0000 1.7
+++ inc/class.html.inc.php 8 Dec 2006 11:37:54 -0000 1.8
@@ -10,7 +10,7 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.html.inc.php,v 1.7 2005/12/07 03:21:04 skwashd Exp $ */
+ /* $Id: class.html.inc.php,v 1.8 2006/12/08 11:37:54 sigurdne Exp $ */
class html
{
@@ -101,6 +101,7 @@
*/
function input_hidden($vars,$value='',$ignore_empty=True)
{
+ $html = '';
if (!is_array($vars))
{
$vars = array( $vars => $value );
Index: inc/class.socalendar_sql.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- inc/class.socalendar_sql.inc.php 7 Dec 2006 11:50:51 -0000 1.46
+++ inc/class.socalendar_sql.inc.php 8 Dec 2006 11:37:54 -0000 1.47
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.socalendar_sql.inc.php,v 1.46 2006/12/07 11:50:51 sigurdne Exp
$ */
+ /* $Id: class.socalendar_sql.inc.php,v 1.47 2006/12/08 11:37:54 sigurdne Exp
$ */
class socalendar_ extends socalendar__
{
@@ -151,7 +151,7 @@
function save_alarm($cal_id,$alarm)
{
//echo "<p>save_alarm(cal_id=$cal_id, alarm="; print_r($alarm);
echo ")</p>\n";
- if (!($id = $alarm['id']))
+ if (!isset($alarm['id']) || !($id = $alarm['id']))
{
$alarms = $this->read_alarms($cal_id); // find a free
alarm#
$n = count($alarms);
Index: inc/class.uialarm.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uialarm.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- inc/class.uialarm.inc.php 6 Dec 2006 17:58:01 -0000 1.12
+++ inc/class.uialarm.inc.php 8 Dec 2006 11:37:54 -0000 1.13
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uialarm.inc.php,v 1.12 2006/12/06 17:58:01 sigurdne Exp $
*/
+ /* $Id: class.uialarm.inc.php,v 1.13 2006/12/08 11:37:54 sigurdne Exp $
*/
class uialarm
{
@@ -37,7 +37,7 @@
$GLOBALS['phpgw']->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$GLOBALS['phpgw']->browser =
CreateObject('phpgwapi.browser');
- $this->theme = $GLOBALS['phpgw_info']['theme'];
+ // $this->theme = $GLOBALS['phpgw_info']['theme'];
$this->bo = CreateObject('calendar.boalarm');
$this->tz_offset = $this->bo->tz_offset;
@@ -67,7 +67,7 @@
unset($GLOBALS['phpgw_info']['flags']['noheader']);
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['app_header'] =
$GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Alarm
Management');
- $GLOBALS['phpgw']->common->phpgw_header();
+ $GLOBALS['phpgw']->common->phpgw_header(True);
$this->template =
CreateObject('phpgwapi.Template',$this->template_dir);
@@ -86,9 +86,9 @@
function output_template_array($row,$list,$var)
{
- if (!isset($var['tr_color']))
+ if (!isset($var['class']))
{
- $var['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_class();
+ $var['class'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_class();
}
$this->template->set_var($var);
$this->template->parse($row,$list,True);
@@ -110,7 +110,7 @@
if ( ( (isset($_POST['enable']) && $_POST['enable']) ||
(isset($_POST['disable']) && $_POST['disable']) )
&& count($_POST['alarm'] ) )
{
- if
($this->bo->enable($_POST['alarm'],$_POST['enable']) < 0)
+ if
($this->bo->enable($_POST['alarm'],(isset($_POST['enable'])?$_POST['enable']:''))
< 0)
{
echo '<center>'.lang('You do not have
permission to enable/disable this alarm !!!').'</center>';
$GLOBALS['phpgw']->common->phpgw_exit(True);
@@ -142,7 +142,6 @@
$GLOBALS['phpgw']->template->pfp('phpgw_body','view_event');
$var = Array(
- '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'),
@@ -158,6 +157,7 @@
{
$this->output_template_array('rows','alarm_headers',$var);
+ $to_delete = '';
foreach($this->event['alarm'] as $key => $alarm)
{
if
(!$this->bo->check_perms(PHPGW_ACL_READALARM, $alarm['owner']))
@@ -169,8 +169,8 @@
//'data' => $alarm['text'],
'data' => 'Email
Notification',
'owner' =>
$GLOBALS['phpgw']->common->grab_owner_name($alarm['owner']),
- 'enabled' =>
($alarm['enabled']?'<img
src="'.$GLOBALS['phpgw']->common->image('calendar','enabled.gif').'" width="13"
height="13" title="'.lang('enabled').'">':
- '<img
src="'.$GLOBALS['phpgw']->common->image('calendar','disabled.gif').'"
width="13" height="13" title="'.lang('disabled').'">'),
+ 'enabled' =>
($alarm['enabled']?'<img
src="'.$GLOBALS['phpgw']->common->image('calendar','enabled.png').'" width="13"
height="13" title="'.lang('enabled').'">':
+ '<img
src="'.$GLOBALS['phpgw']->common->image('calendar','disabled.png').'"
width="13" height="13" title="'.lang('disabled').'">'),
'select' => '<input
type="checkbox" name="alarm['.$alarm['id'].']">'
);
if
($this->bo->check_perms(PHPGW_ACL_DELETEALARM,$alarm['owner']))
@@ -192,9 +192,9 @@
$this->template->set_var(Array(
'hidden_vars' =>
$this->html->input_hidden('cal_id',$this->bo->cal_id),
'input_text' => lang('Email
reminder'),
- 'input_days' =>
$this->html->select('time[days]',$_POST['time']['days'],range(0,31),True).'
'.lang('days'),
- 'input_hours' =>
$this->html->select('time[hours]',$_POST['time']['hours'],range(0,24),True).'
'.lang('hours'),
- 'input_minutes' =>
$this->html->select('time[mins]',$_POST['time']['mins'],range(0,60),True).'
'.lang('minutes').' '.lang('before the event'),
+ 'input_days' =>
$this->html->select('time[days]',(isset($_POST['time']['days'])?$_POST['time']['days']:''),range(0,31),True).'
'.lang('days'),
+ 'input_hours' =>
$this->html->select('time[hours]',(isset($_POST['time']['hours'])?$_POST['time']['hours']:''),range(0,24),True).'
'.lang('hours'),
+ 'input_minutes' =>
$this->html->select('time[mins]',(isset($_POST['time']['mins'])?$_POST['time']['mins']:''),range(0,60),True).'
'.lang('minutes').' '.lang('before the event'),
'input_owner' =>
$this->html->select('owner',$GLOBALS['phpgw_info']['user']['account_id'],$this->bo->participants($this->event,True),True),
'input_add' =>
$this->html->submit_button('add','Add Alarm')
));
Index: inc/class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- inc/class.uicalendar.inc.php 7 Dec 2006 19:00:46 -0000 1.134
+++ inc/class.uicalendar.inc.php 8 Dec 2006 11:37:54 -0000 1.135
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uicalendar.inc.php,v 1.134 2006/12/07 19:00:46 sigurdne
Exp $ */
+ /* $Id: class.uicalendar.inc.php,v 1.135 2006/12/08 11:37:54 sigurdne
Exp $ */
class uicalendar
{
@@ -794,7 +794,7 @@
$this->edit_form(
array(
'event' => $event,
- 'cd' => $cd
+ 'cd' => (isset($cd)?$cd:'')
//not set - missing something ?
)
);
}
@@ -3184,7 +3184,7 @@
{
$icon = '<img
src="'.$GLOBALS['phpgw']->common->image('calendar',($alarm['enabled']?'enabled':'disabled')).'"
width="13" height="13">';
$var = array(
- 'field' =>
$icon.$GLOBALS['phpgw']->common->show_date($alarm['time']),
+ 'field' => $icon . ' ' .
$GLOBALS['phpgw']->common->show_date($alarm['time']),
'data' => 'Email Notification'
);
$this->output_template_array($p,'row','list',$var);
@@ -3447,12 +3447,13 @@
$increment = $this->bo->prefs['calendar']['interval'];
$interval = (int)(60 / $increment);
- $pix =
$GLOBALS['phpgw']->common->image('calendar','pix');
+ // $pix =
$GLOBALS['phpgw']->common->image('calendar','pix');
$str = '<center><font size="+1"
color="#000000"><b>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l'))
. ',
'.$this->bo->long_date($date).'</b></font><br />'
. '<table width="85%" cellspacing="0"
cellpadding="0" cols="'.((24 * $interval) + 1).'">'
- . '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="black"><img src="'.$pix.'"></td></tr>'
+ // . '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="black"><img src="'.$pix.'"></td></tr>'
+ . '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="black"></td></tr>'
. '<tr><td width="15%"><font
color="'.$this->theme['bg_text'].'" face="'.$this->theme['font'].'"
size="-2">'.lang('Participant').'</font></td>';
for($i=0;$i<24;$i++)
{
@@ -3466,7 +3467,8 @@
}
}
$str .= '</tr>'
- . '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="black"><img src="'.$pix.'"></td></tr>';
+// . '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="black"><img src="'.$pix.'"></td></tr>';
+ . '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="black"></td></tr>';
if(!$endtime)
{
$endtime = $starttime;
@@ -3514,22 +3516,25 @@
switch($time_slice[$index]['marker'])
{
case ' ':
-
$time_slice[$index]['color'] = $this->theme['bg_color'];
+ //
$time_slice[$index]['color'] = $this->theme['bg_color'];
+
$time_slice[$index]['class'] = '';
$extra
= '';
break;
case '-':
-
$time_slice[$index]['color'] = $this->theme['bg01'];
+ //
$time_slice[$index]['color'] = $this->theme['bg01'];
+
$time_slice[$index]['class'] = 'th';
$link =
$this->page('view','&cal_id='.$time_slice[$index]['id'].'&date='.$date['full']);
$extra
=' title="'.$time_slice[$index]['description'].'"
onClick="location.href=\''.$link.'\';" style="cursor:pointer; cursor:hand;"';
break;
}
- $str .= '<td
bgcolor="'.$time_slice[$index]['color'].'"
color="#999999"'.$extra.'>'.$time_slice[$index]['marker'].'</td>';
+ $str .= '<td
class="'.$time_slice[$index]['class'].'"
color="#999999"'.$extra.'>'.$time_slice[$index]['marker'].'</td>';
}
$str .= "\n";
}
}
$str .= '</tr>'
- . '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="#999999"><img src="'.$pix.'"></td></tr>';
+ // . '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="#999999"><img src="'.$pix.'"></td></tr>';
+ . '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="#999999"></td></tr>';
}
$this->bo->owner = $owner;
$this->bo->so->owner = $owner;
@@ -3961,7 +3966,9 @@
'data' => '<select
name="cal[recur_type]">'."\n".$str.'</select>'."\n"
);
- if($event['recur_enddate']['year'] != 0 &&
$event['recur_enddate']['month'] != 0 && $event['recur_enddate']['mday'] != 0)
+ if((isset($event['recur_enddate']['year']) &&
$event['recur_enddate']['year'] != 0)
+ && (isset($event['recur_enddate']['month']) &&
$event['recur_enddate']['month'] != 0)
+ && (isset($event['recur_enddate']['mday']) &&
$event['recur_enddate']['mday'] != 0))
{
$checked = ' checked';
$recur_end =
$this->bo->maketime($event['recur_enddate']) -
$GLOBALS['phpgw']->datetime->tz_offset;
@@ -3988,7 +3995,7 @@
$i = 0; $boxes = '';
foreach ($this->bo->rpt_day as $mask => $name)
{
- $boxes .= '<input type="checkbox"
name="cal[rpt_day][]" value="'.$mask.'"'.($event['recur_data'] & $mask ? '
checked' : '').'> '.lang($name)."\n";
+ $boxes .= '<input type="checkbox"
name="cal[rpt_day][]" value="'.$mask.'"'.(isset($event['recur_data']) &&
$event['recur_data'] & $mask ? ' checked' : '').'> '.lang($name)."\n";
if (++$i == 5) $boxes .= '<br />';
}
$var['recure_day'] = array(
@@ -3998,7 +4005,7 @@
$var['recure_interval'] = array(
'field' => lang('Interval'),
- 'data' => '<input name="cal[recur_interval]"
size="4" maxlength="4" value="'.$event['recur_interval'].'">'
+ 'data' => '<input name="cal[recur_interval]"
size="4" maxlength="4"
value="'.(isset($event['recur_interval'])?$event['recur_interval']:'').'">'
);
if (!isset($this->fields))
Index: templates/base/alarm.tpl
===================================================================
RCS file: /sources/phpgroupware/calendar/templates/base/alarm.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/alarm.tpl 28 Jul 2006 03:30:43 -0000 1.1
+++ templates/base/alarm.tpl 8 Dec 2006 11:37:54 -0000 1.2
@@ -1,4 +1,4 @@
-<!-- $Id: alarm.tpl,v 1.1 2006/07/28 03:30:43 skwashd Exp $ -->
+<!-- $Id: alarm.tpl,v 1.2 2006/12/08 11:37:54 sigurdne Exp $ -->
<!-- BEGIN alarm_management -->
<form action="{action_url}" method="post" name="alarmform">
{hidden_vars}
@@ -17,17 +17,17 @@
</form>
<!-- END alarm_management -->
<!-- BEGIN alarm_headers -->
- <tr bgcolor="{tr_color}">
- <th align="left" width="25%">{lang_time}</th>
- <th align="left" width="30%">{lang_text}</th>
- <th align="left" width="25%">{lang_owner}</th>
- <th width="10%">{lang_enabled}</th>
- <th width="10%">{lang_select}</th>
+ <tr class="th">
+ <td align="left" width="25%">{lang_time}</td>
+ <td align="left" width="30%">{lang_text}</td>
+ <td align="left" width="25%">{lang_owner}</td>
+ <td width="10%">{lang_enabled}</td>
+ <td width="10%">{lang_select}</td>
</tr>
<!-- END alarm_headers -->
<!-- BEGIN list -->
- <tr bgcolor="{tr_color}">
- <td><b>{field}:</b></td>
+ <tr class="{class}">
+ <td>{field}:</td>
<td>{data}</td>
<td>{owner}</td>
<td align="center">{enabled}</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] calendar inc/class.boalarm.inc.php inc/class.bo...,
Sigurd Nes <=