[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php |
|
Date: |
Mon, 11 Dec 2006 09:03:31 +0000 |
CVSROOT: /sources/phpgroupware
Module name: calendar
Changes by: Sigurd Nes <sigurdne> 06/12/11 09:03:31
Modified files:
inc : class.uicalendar.inc.php
Log message:
links
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.140&r2=1.141
Patches:
Index: class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- class.uicalendar.inc.php 9 Dec 2006 20:41:46 -0000 1.140
+++ class.uicalendar.inc.php 11 Dec 2006 09:03:31 -0000 1.141
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uicalendar.inc.php,v 1.140 2006/12/09 20:41:46 sigurdne
Exp $ */
+ /* $Id: class.uicalendar.inc.php,v 1.141 2006/12/11 09:03:31 sigurdne
Exp $ */
class uicalendar
{
@@ -212,7 +212,7 @@
}
- $month = '<a href="' .
$this->page('month','&month='.$GLOBALS['phpgw']->common->show_date($date['raw'],'m').'&year='.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y')).
'" class="minicalendar">' .
lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).'
'.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'</a>';
+ $month = '<a href="' .
$this->page('month',array('month'=>$GLOBALS['phpgw']->common->show_date($date['raw'],'m'),'year'=>$GLOBALS['phpgw']->common->show_date($date['raw'],'Y'))).
'" class="minicalendar">' .
lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).'
'.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'</a>';
$var = array(
'cal_img_root' =>
$GLOBALS['phpgw']->common->image('calendar','mini-calendar-bar'),
@@ -229,18 +229,18 @@
{
case 'right':
$var = array(
- 'nextmonth'
=> '<a href="'.$this->page('month','&date='.$month_ahead).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'"></a>'
+ 'nextmonth'
=> '<a href="'.$this->page('month',array('date'=>$month_ahead)).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'"></a>'
);
break;
case 'left':
$var = array(
- 'prevmonth'
=> '<a href="'.$this->page('month','&date='.$month_ago).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'"></a>'
+ 'prevmonth'
=> '<a href="'.$this->page('month',array('date'=>$month_ago)).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'"></a>'
);
break;
case 'both':
$var = array(
- 'prevmonth'
=> '<a href="'.$this->page('month','&date='.$month_ago).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'"></a>',
- 'nextmonth'
=> '<a href="'.$this->page('month','&date='.$month_ahead).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'"></a>'
+ 'prevmonth'
=> '<a href="'.$this->page('month',array('date'=>$month_ago)).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'"></a>',
+ 'nextmonth'
=> '<a href="'.$this->page('month',array('date'=>$month_ahead)).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'"></a>'
);
break;
case 'none':
@@ -280,7 +280,7 @@
$str = '';
if(($date >= $monthstart && $date <=
$monthend) || $params['outside_month'] == True)
{
- $str = '<a
href="'.$this->page($params['link'],'&date='.$date).'"
class="'.$day_params['class'].'">'.$day.'</a>';
+ $str = '<a
href="'.$this->page($params['link'],array('date'=>$date)).'"
class="'.$day_params['class'].'">'.$day.'</a>';
}
else
{
@@ -359,7 +359,7 @@
if (!$this->bo->printer_friendly)
{
$printer = '';
- $param =
'&year='.$this->bo->year.'&month='.$this->bo->month.'&friendly=1';
+ $param =
array('year'=>$this->bo->year,'month'=>$this->bo->month,'friendly'=>1);
$print = '<a
href="'.$this->page('month',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
}
else
@@ -445,10 +445,10 @@
if (!$this->bo->printer_friendly)
{
- $param =
'&friendly=1&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day);
+ $param =
array('friendly'=>1,'date'=>sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day));
$printer = '';
- $prev_week_link = '<a href="'.
$this->page($week_type_name,'&date='.$prev['full']).'"><<</a>';
- $next_week_link = '<a href="'.
$this->page($week_type_name,'&date='.$next['full']).'">>></a>';
+ $prev_week_link = '<a href="'.
$this->page($week_type_name,array('date'=>$prev['full'])).'"><<</a>';
+ $next_week_link = '<a href="'.
$this->page($week_type_name,array('date'=>$next['full'])).'">>></a>';
$print = '<a
href="'.$this->page('week',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
}
else
@@ -512,10 +512,10 @@
if(!$this->bo->printer_friendly)
{
- $param = '&friendly=1&year='.$this->bo->year;
+ $param =
array('friendly'=>1,'year'=>$this->bo->year);
$print = '';
- $left_link = '<a
href="'.$this->page('year','&year='.($this->bo->year - 1)).'"><<</a>';
- $right_link = '<a
href="'.$this->page('year','&year='.($this->bo->year + 1)).'">>></a>';
+ $left_link = '<a
href="'.$this->page('year',array('year'=>($this->bo->year -
1))).'"><<</a>';
+ $right_link = '<a
href="'.$this->page('year',array('year'=>($this->bo->year +
1))).'">>></a>';
$link = 'day';
$printer = '<a
href="'.$this->page('year',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
}
@@ -645,7 +645,7 @@
if($event['recur_type'] != MCAL_RECUR_NONE)
{
$var = array(
- 'action_url_button' =>
$this->page('edit','&cal_id='.$cal_id),
+ 'action_url_button' =>
$this->page('edit',array('cal_id'=>$cal_id)),
'action_text_button' =>
lang('Edit Single'),
'action_confirm_button' => '',
'action_extra_field' =>
'<input type="hidden" name="edit_type" value="single">'."\n"
@@ -655,7 +655,7 @@
$button_left .=
'<td>'.$p->fp('button','form_button').'</td>';
$var = array(
- 'action_url_button' =>
$this->page('edit','&cal_id='.$cal_id),
+ 'action_url_button' =>
$this->page('edit',array('cal_id'=>$cal_id)),
'action_text_button' =>
lang('Edit Series'),
'action_confirm_button' => '',
'action_extra_field' =>
'<input type="hidden" name="edit_type" value="series">'
@@ -666,7 +666,7 @@
else
{
$var = array(
- 'action_url_button' =>
$this->page('edit','&cal_id='.$cal_id),
+ 'action_url_button' =>
$this->page('edit',array('cal_id'=>$cal_id)),
'action_text_button' =>
lang('Edit'),
'action_confirm_button' => '',
'action_extra_field' => ''
@@ -937,7 +937,7 @@
));
$var = array(
- 'action_url_button' =>
$this->page('reinstate','&cal_id='.$cal_id),
+ 'action_url_button' =>
$this->page('reinstate',array('cal_id'=>$cal_id)),
'action_text_button' => lang('Reinstate'),
'action_confirm_button' => '',
'action_extra_field' => ''
@@ -1110,8 +1110,6 @@
'link' => 'day'
));
- $param =
'&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day).'&friendly=1';
-
$now = $GLOBALS['phpgw']->datetime->makegmttime(0,
0, 0, $this->bo->month, $this->bo->day, $this->bo->year);
$now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset;
@@ -1124,7 +1122,7 @@
if (!$this->bo->printer_friendly)
{
$printer = '';
- $param =
'&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day).'&friendly=1';
+ $param =
array('date'=>sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day),'friendly'=>1);
$print = '<a
href="'.$this->page('day',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
}
else
@@ -2647,7 +2645,7 @@
if ($editable)
{
$date =
sprintf('%04d%02d%02d',$year,$month,$day);
-
$this->link_tpl->set_var('link_link',$this->page('view','&cal_id='.$event['id'].'&date='.$date));
+
$this->link_tpl->set_var('link_link',$this->page('view',array('cal_id'=>$event['id'],'date'=>$date)));
#$this->link_tpl->set_var('lang_view',lang('View this entry'));
$this->link_tpl->parse('picture','link_open',True);
@@ -3001,10 +2999,10 @@
{
if ($day_params['new_event'])
{
- $new_event_link = ' <a
href="'.$this->page('add','&date='.$date).'">'
+ $new_event_link = ' <a
href="'.$this->page('add',array('date'=>$date)).'">'
. '<img
src="'.$GLOBALS['phpgw']->common->image('calendar','new').'" width="10"
height="10" alt="'.lang('New Entry').'" title="'.lang('New Entry').'"
align="center">'
. '</a>';
- $day_number = '<a
href="'.$this->page('day','&date='.$date).'">'.$day.'</a>';
+ $day_number = '<a
href="'.$this->page('day',array('date'=>$date)).'">'.$day.'</a>';
}
else
{
@@ -3020,7 +3018,7 @@
if($day_params['week'])
{
$tmp_str = ($this->week_type ==
'new') ? ' ' : ' ';
- $var['new_event_link'] .=
'<font size="-2">'. $tmp_str . '<a
href="'.$this->page('week_new','&date='.$date).'">' .$day_params['week'].'</a>';
+ $var['new_event_link'] .=
'<font size="-2">'. $tmp_str . '<a
href="'.$this->page('week_new',array('date'=>$date)).'">'
.$day_params['week'].'</a>';
}
$p->set_var($var);
@@ -3240,7 +3238,7 @@
{
if
($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && ereg('^(.*)
\((.*)\)$',$str,$parts))
{
- $vars['participants']['data'][$user] =
$parts[1].' (<a
href="'.$this->page('edit_status','&cal_id='.$event['id'].'&owner='.$user).'">'.$parts[2].'</a>)';
+ $vars['participants']['data'][$user] =
$parts[1].' (<a
href="'.$this->page('edit_status',array('cal_id'=>$event['id'],'owner'=>$user)).'">'.$parts[2].'</a>)';
}
}
$vars['participants']['data'] = implode("<br
/>\n",$vars['participants']['data']);
@@ -3476,7 +3474,7 @@
## by tb
if (
$this->bo->check_perms(PHPGW_ACL_ADD) )
{
- $open_link .= '<a
href="'.$this->page('add',"&date=$date_to_eval&hour=$hour&minute=$min").'">';
+ $open_link .= '<a
href="'.$this->page('add',array('date'=>$date_to_eval,'hour'=>$hour,'minute'=>$min)).'">';
$close_link = '</a>';
}
}
@@ -3544,7 +3542,7 @@
$k = ($j == 0 ? sprintf('%02d',$i).'<br
/>':'').sprintf('%02d',$j*$increment);
$str .= '<td align="left"
bgcolor="'.$this->theme['bg_color'].'">'
- . '<a
href="'.$this->page('add','&date='.$date['full'].'&hour='.$i.'&minute='.($interval
* $j))."\" onMouseOver=\"window.status='".$i.':'.(($increment *
$j)<=9?'0':'').($increment * $j)."'; return true;\">"
+ . '<a
href="'.$this->page('add',array('date'=>$date['full'],'hour'=>$i,'minute'=>($interval
* $j))) ."\" onMouseOver=\"window.status='".$i.':'.(($increment *
$j)<=9?'0':'').($increment * $j)."'; return true;\">"
. $k."</a></td>\n";
}
}
@@ -3605,7 +3603,7 @@
case '-':
//
$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']);
+ $link =
$this->page('view',array('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;
}
@@ -3644,7 +3642,7 @@
while(list($param,$text) = each($response_choices))
{
$var = array(
- 'action_url_button' =>
$this->page('set_action','&cal_id='.$cal_id.'&action='.$param),
+ 'action_url_button' =>
$this->page('set_action',array('cal_id'=>$cal_id,'action'=>$param)),
'action_text_button' => ' '.$text.'
',
'action_confirm_button' => '',
'action_extra_field' => ''
@@ -4185,7 +4183,7 @@
if ($event['id'] > 0)
{
$var = array(
- 'action_url_button' =>
$this->page('delete','&cal_id='.$event['id']),
+ 'action_url_button' =>
$this->page('delete',array('cal_id'=>$event['id'])),
'action_text_button' =>
lang('Delete'),
'action_confirm_button' =>
"onClick=\"return confirm('".lang("Are you sure\\nyou want to\\ndelete this
entry ?\\n\\nThis will delete\\nthis entry for all users.")."')\"",
'action_extra_field' => ''
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, Dave Hall, 2006/12/05
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, Sigurd Nes, 2006/12/09
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, Sigurd Nes, 2006/12/09
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, Sigurd Nes, 2006/12/09
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php,
Sigurd Nes <=
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, Sigurd Nes, 2006/12/11
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, Sigurd Nes, 2006/12/11
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, Sigurd Nes, 2006/12/11
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, Sigurd Nes, 2006/12/12
- [Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, Dave Hall, 2006/12/14