holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed probs pointed out by Joxean Koret

Browse Source
This commit is contained in:
Ralf Becker 2004-08-22 18:44:47 +00:00
parent aa86cc11eb
commit 9f9ef95b80
3 changed files with 58 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
calendar/inc/class.bocalendar.inc.php
View File

@ -207,17 +207,17 @@
unset($this->save_owner); unset($this->save_owner);
} }
if(isset($owner) && $owner!='' && substr($owner,0,2) == 'g_') if(isset($owner) && substr($owner,0,2) == 'g_')
{ {
$this->set_owner_to_group(substr($owner,2)); $this->set_owner_to_group((int) substr($owner,2));
} }
elseif(isset($owner) && $owner!='') elseif(isset($owner) && $owner)
{ {
$this->owner = (int)$owner; $this->owner = (int) $owner;
} }
elseif(!@isset($this->owner) || !@$this->owner) if(!@isset($this->owner) || !@$this->owner)
{ {
$this->owner = (int)$GLOBALS['phpgw_info']['user']['account_id']; $this->owner = (int) $GLOBALS['phpgw_info']['user']['account_id'];
} }
elseif(isset($this->owner) && $GLOBALS['phpgw']->accounts->get_type($this->owner) == 'g') elseif(isset($this->owner) && $GLOBALS['phpgw']->accounts->get_type($this->owner) == 'g')
{ {
@ -236,24 +236,27 @@
} }
$this->holiday_color = (substr($GLOBALS['phpgw_info']['theme']['bg07'],0,1)=='#'?'':'#').$GLOBALS['phpgw_info']['theme']['bg07']; $this->holiday_color = (substr($GLOBALS['phpgw_info']['theme']['bg07'],0,1)=='#'?'':'#').$GLOBALS['phpgw_info']['theme']['bg07'];
$friendly = (isset($_GET['friendly'])?$_GET['friendly']:''); $friendly = (int) get_var('friendly',array('GET','POST'),0);
$friendly = ($friendly=='' && isset($_POST['friendly'])?$_POST['friendly']:$friendly);
$this->printer_friendly = ((int)$friendly == 1?True:False); $this->printer_friendly = ((int)$friendly == 1?True:False);
if(isset($_POST['filter'])) { $this->filter = $_POST['filter']; } if(isset($_POST['filter']) && ($_POST['filter'] == ' all ' || $_POST['filter'] == ' privat '))
if(isset($_REQUEST['sortby'])) { $this->sortby = $_REQUEST['sortby']; } {
if(isset($_POST['cat_id'])) { $this->cat_id = $_POST['cat_id']; } $this->filter = $_POST['filter'];
}
if(!isset($this->filter)) else
{ {
$this->filter = ' '.$this->prefs['calendar']['defaultfilter'].' '; $this->filter = ' '.$this->prefs['calendar']['defaultfilter'].' ';
} }
if(isset($_REQUEST['sortby']) && ($_REQUEST['sortby'] == 'user' || $_REQUEST['sortby'] == 'category'))
if(!isset($this->sortby)) {
$this->sortby = $_REQUEST['sortby'];
}
else
{ {
$this->sortby = $this->prefs['calendar']['defaultcalendar'] == 'planner_user' ? 'user' : 'category'; $this->sortby = $this->prefs['calendar']['defaultcalendar'] == 'planner_user' ? 'user' : 'category';
} }
if(isset($_POST['cat_id'])) { $this->cat_id = (int) $_POST['cat_id']; }
if($GLOBALS['phpgw']->accounts->get_type($this->owner)=='g') if($GLOBALS['phpgw']->accounts->get_type($this->owner)=='g')
{ {
@ -299,65 +302,23 @@
$localtime = $GLOBALS['phpgw']->datetime->users_localtime; $localtime = $GLOBALS['phpgw']->datetime->users_localtime;
$date = (isset($GLOBALS['date'])?$GLOBALS['date']:''); $num_months = (int) get_var('num_month',array('GET','POST'),1);
$date = (isset($_GET['date'])?$_GET['date']:$date);
$date = ($date=='' && isset($_POST['date'])?$_POST['date']:$date);
$year = (isset($_GET['year'])?$_GET['year']:''); $this->date = (int) get_var('date',array('GET','POST'));
$year = ($year=='' && isset($_POST['year'])?$_POST['year']:$year); if($this->date)
$month = (isset($_GET['month'])?$_GET['month']:'');
$month = ($month=='' && isset($_POST['month'])?$_POST['month']:$month);
$day = (isset($_GET['day'])?$_GET['day']:'');
$day = ($day=='' && isset($_POST['day'])?$_POST['day']:'');
$num_months = (isset($_GET['num_months'])?$_GET['num_months']:'');
$num_months = ($num_months=='' && isset($_POST['num_months'])?$_POST['num_months']:$num_months);
if(isset($date) && $date!='')
{ {
$this->year = (int)(substr($date,0,4)); $this->year = (int) substr($this->date,0,4);
$this->month = (int)(substr($date,4,2)); $this->month = (int) substr($this->date,4,2);
$this->day = (int)(substr($date,6,2)); $this->day = (int) substr($this->date,6,2);
} }
else else
{ {
if(isset($year) && $year!='') foreach(array('year' => 'Y','month' => 'm','day' => 'd') as $var => $pat)
{ {
$this->year = $year; $this->$var = (int) get_var($var,array('POST','GET'),date($pat,$localtime));
} }
else $this->date = sprintf('%04d%02d%02d',$this->year,$this->month,$this->day);
{
$this->year = date('Y',$localtime);
} }
if(isset($month) && $month!='')
{
$this->month = $month;
}
else
{
$this->month = date('m',$localtime);
}
if(isset($day) && $day!='')
{
$this->day = $day;
}
else
{
$this->day = date('d',$localtime);
}
}
if(isset($num_months) && $num_months!='')
{
$this->num_months = $num_months;
}
elseif($this->num_months == 0)
{
$this->num_months = 1;
}
$this->today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime); $this->today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
if(DEBUG_APP) if(DEBUG_APP)
@ -879,6 +840,10 @@
{ {
$this->so->set_category(strval($l_categories[0])); $this->so->set_category(strval($l_categories[0]));
} }
foreach(array('title','description','location') as $name)
{
$l_cal[$name] = strip_tags($l_cal[$name]);
}
$this->so->set_title($l_cal['title']); $this->so->set_title($l_cal['title']);
$this->so->set_description($l_cal['description']); $this->so->set_description($l_cal['description']);
$this->so->set_start($l_start['year'],$l_start['month'],$l_start['mday'],$l_start['hour'],$l_start['min'],0); $this->so->set_start($l_start['year'],$l_start['month'],$l_start['mday'],$l_start['hour'],$l_start['min'],0);
@ -922,6 +887,10 @@
$l_cal['recur_data'] |= (int)$mask; $l_cal['recur_data'] |= (int)$mask;
} }
} }
if (!$l_cal['recur_data']) // no day set ==> use the day of the startdate
{
$l_cal['recur_data'] = array_search(date('l',$this->maketime($l_start)-$GLOBALS['phpgw']->datetime->tz_offset),$this->rpt_day);
}
$this->so->set_recur_weekly((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval'],$l_cal['recur_data']); $this->so->set_recur_weekly((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval'],$l_cal['recur_data']);
break; break;
case MCAL_RECUR_MONTHLY_MDAY: case MCAL_RECUR_MONTHLY_MDAY:

2
calendar/inc/class.uical.inc.php
View File

@ -339,7 +339,7 @@ class uical
// Search // Search
$blur = addslashes($this->html->htmlspecialchars(lang('Search').'...')); $blur = addslashes($this->html->htmlspecialchars(lang('Search').'...'));
$value = @$_POST['keywords'] ? $_POST['keywords'] : $blur; $value = @$_POST['keywords'] ? $this->html->htmlspecialchars($_POST['keywords']) : $blur;
$file[++$n] = array( $file[++$n] = array(
'text' => $this->html->form('<input name="keywords" value="'.$value.'" style="width: 100%;"'. 'text' => $this->html->form('<input name="keywords" value="'.$value.'" style="width: 100%;"'.
' onFocus="if(this.value==\''.$blur.'\') this.value=\'\';"'. ' onFocus="if(this.value==\''.$blur.'\') this.value=\'\';"'.

57
calendar/inc/class.uicalendar.inc.php
View File

@ -736,7 +736,7 @@
$cal_id = get_var('cal_id',array('GET','POST'),$vcal_id); $cal_id = get_var('cal_id',array('GET','POST'),$vcal_id);
$date = $cal_date ? $cal_date : 0; $date = $cal_date ? $cal_date : 0;
$date = $date ? $date : (int)$_GET['date']; $date = $date ? $date : (int)$this->bo->date;
// First, make sure they have permission to this entry // First, make sure they have permission to this entry
if ($cal_id < 1) if ($cal_id < 1)
@ -1044,7 +1044,7 @@
$extra_field_text .= '<font color="red">'.lang('please enter a filename !!!')."</font>\n"; $extra_field_text .= '<font color="red">'.lang('please enter a filename !!!')."</font>\n";
} }
if(isset($_POST['cal_id'])) if(isset($_POST['cal_id']))
$extra_field_text .= ' <input type="hidden" name="cal_id" value="'.$_POST['cal_id'].'">'."\n"; $extra_field_text .= ' '.$this->html->input_hidden('cal_id',(int)$_POST['cal_id']);
if (!isset($_POST['cal_id']) || !$_POST['cal_id']) if (!isset($_POST['cal_id']) || !$_POST['cal_id'])
{ {
@ -2385,13 +2385,14 @@
} }
echo "\n<br>\n".'<form action="'.$this->page('viewmatrix').'" method="post" name="matrixform">'."\n"; echo "\n<br>\n".'<form action="'.$this->page('viewmatrix').'" method="post" name="matrixform">'."\n";
echo ' <table cellpadding="5"><tr><td>'."\n"; echo ' <table cellpadding="5"><tr><td>'."\n";
echo ' <input type="hidden" name="year" value="'.$date["year"].'">'."\n"; echo ' '.$this->html->input_hidden('year',$this->bo->year);
echo ' <input type="hidden" name="month" value="'.$date["month"] .'">'."\n"; echo ' '.$this->html->input_hidden('month',$this->bo->month);
echo ' <input type="hidden" name="day" value="'.$date["day"].'">'."\n"; echo ' '.$this->html->input_hidden('day',$this->bo->day);
echo ' <input type="hidden" name="matrixtype" value="'.get_var("matrixtype", array("POST", "GET")).'">'."\n"; echo ' '.$this->html->input_hidden('matrixtype',$_REQUEST['matrixtype']);
foreach($participants as $part) foreach($participants as $part)
{ {
echo ' <input type="hidden" name="participants[]" value="'.$part.'">'."\n"; $part = substr($part,0,2) == 'g_' ? 'g_'.(int) substr($part,2) : (int) $part;
echo ' '.$this->html->input_hidden('participants[]',$part);
} }
echo ' <input type="submit" name="refresh" value="'.lang('Refresh').'">'."\n"; echo ' <input type="submit" name="refresh" value="'.lang('Refresh').'">'."\n";
echo ' </td><td>'."\n"; echo ' </td><td>'."\n";
@ -2717,13 +2718,13 @@ return;
$str = ''; $str = '';
$date_str = ''; $date_str = '';
if(isset($_GET['date']) && $_GET['date']) if($this->bo->date)
{ {
$date_str .= ' <input type="hidden" name="date" value="'.$_GET['date'].'">'."\n"; $date_str .= ' '.$this->html->input_hidden('date',$this->bo->date);
} }
$date_str .= ' <input type="hidden" name="month" value="'.$this->bo->month.'">'."\n"; $date_str .= ' '.$this->html->input_hidden('month',$this->bo->month);
$date_str .= ' <input type="hidden" name="day" value="'.$this->bo->day.'">'."\n"; $date_str .= ' '.$this->html->input_hidden('day',$this->bo->day);
$date_str .= ' <input type="hidden" name="year" value="'.$this->bo->year.'">'."\n"; $date_str .= ' '.$this->html->input_hidden('year',$this->bo->year);
for($i=1; $i<=6; $i++) for($i=1; $i<=6; $i++)
{ {
@ -3996,13 +3997,13 @@ return;
'font' => $this->theme['font'], 'font' => $this->theme['font'],
'bg_color' => $this->theme['bg_text'], 'bg_color' => $this->theme['bg_text'],
'action_url' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.bocalendar.update')), 'action_url' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.bocalendar.update')),
'common_hidden' => '<input type="hidden" name="cal[id]" value="'.$event['id'].'">'."\n" 'common_hidden' => $this->html->input_hidden('cal[id]',$event['id'])
. '<input type="hidden" name="cal[owner]" value="'.$event['owner'].'">'."\n" . $this->html->input_hidden('cal[owner]',$event['owner'])
. '<input type="hidden" name="cal[uid]" value="'.$event['uid'].'">'."\n" . $this->html->input_hidden('cal[uid]',$event['uid'])
. ($_GET['cal_id'] && $event['id'] == 0?'<input type="hidden" name="cal[reference]" value="'.$_GET['cal_id'].'">'."\n": . ($_GET['cal_id'] && $event['id'] == 0?$this->html->input_hidden('cal[reference]',$_GET['cal_id']) :
(@isset($event['reference'])?'<input type="hidden" name="cal[reference]" value="'.$event['reference'].'">'."\n":'')) (@isset($event['reference'])?$this->html->input_hidden('cal[reference]',$event['reference']):''))
. (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']? . (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']?
'<input type="hidden" name="participants[]" value="'.$this->bo->owner.'">'."\n":''), $this->html->input_hidden('participants[]',$this->bo->owner):''),
'errormsg' => ($param['cd']?$GLOBALS['phpgw']->common->check_code($param['cd']):'') 'errormsg' => ($param['cd']?$GLOBALS['phpgw']->common->check_code($param['cd']):'')
); );
$p->set_var($vars); $p->set_var($vars);
@ -4085,13 +4086,6 @@ return;
$start = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset; $start = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
$var['startdate'] = Array( $var['startdate'] = Array(
'field' => lang('Start Date'), 'field' => lang('Start Date'),
/*
'data' => $GLOBALS['phpgw']->common->dateformatorder(
$sb->getYears('start[year]',(int)$GLOBALS['phpgw']->common->show_date($start,'Y')),
$sb->getMonthText('start[month]',(int)$GLOBALS['phpgw']->common->show_date($start,'n')),
$sb->getDays('start[mday]',(int)$GLOBALS['phpgw']->common->show_date($start,'d'))
)
*/
'data' => $this->jscal->input('start[str]',$start) 'data' => $this->jscal->input('start[str]',$start)
); );
@ -4110,13 +4104,6 @@ return;
$end = $this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset; $end = $this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset;
$var['enddate'] = Array( $var['enddate'] = Array(
'field' => lang('End Date'), 'field' => lang('End Date'),
/*
'data' => $GLOBALS['phpgw']->common->dateformatorder(
$sb->getYears('end[year]',(int)$GLOBALS['phpgw']->common->show_date($end,'Y')),
$sb->getMonthText('end[month]',(int)$GLOBALS['phpgw']->common->show_date($end,'n')),
$sb->getDays('end[mday]',(int)$GLOBALS['phpgw']->common->show_date($end,'d'))
)
*/
'data' => $this->jscal->input('end[str]',$end) 'data' => $this->jscal->input('end[str]',$end)
); );
@ -4189,9 +4176,9 @@ return;
// DEBUG START // DEBUG START
. '<input type="button" value="Status" onClick="javascript:show()">'."\n" . '<input type="button" value="Status" onClick="javascript:show()">'."\n"
// DEBUG END // DEBUG END
. '<input type="button" onClick="javascript:modify_window(\''.$url.'&part='.$part . '<input type="button" onClick="javascript:modify_window(\$url.'&part='.$part
. '\')" value="'.lang('Modify List of External Participants').'">'."\n" . '\')" value="'.lang('Modify List of External Participants').'">'."\n"
. '<input type="hidden" name="ext_part_id" value="'.$part.'">'."\n"; . $this->html->input_hidden('ext_part_id" value="'.$part.'">'."\n";
$var[] = Array( $var[] = Array(
'field' => "\n".lang('External Participants'), 'field' => "\n".lang('External Participants'),
@ -4415,7 +4402,7 @@ return;
if (is_array($preserved)) if (is_array($preserved))
{ {
//echo "preserving<pre>"; print_r($preserved); echo "</pre>\n"; //echo "preserving<pre>"; print_r($preserved); echo "</pre>\n";
$p->set_var('common_hidden',$p->get_var('common_hidden').'<input type="hidden" name="preserved" value="'.htmlspecialchars(serialize($preserved)).'">'."\n"); $p->set_var('common_hidden',$p->get_var('common_hidden').$this->html->input_hidden('preserved',serialize($preserved)));
} }
$p->set_var('submit_button',lang('Save')); $p->set_var('submit_button',lang('Save'));