[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: |
Sat, 09 Dec 2006 20:41:46 +0000 |
CVSROOT: /sources/phpgroupware
Module name: calendar
Changes by: Sigurd Nes <sigurdne> 06/12/09 20:41:46
Modified files:
inc : class.uicalendar.inc.php
Log message:
fix printerfriendly url
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.139&r2=1.140
Patches:
Index: class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- class.uicalendar.inc.php 9 Dec 2006 19:33:19 -0000 1.139
+++ class.uicalendar.inc.php 9 Dec 2006 20:41:46 -0000 1.140
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uicalendar.inc.php,v 1.139 2006/12/09 19:33:19 sigurdne
Exp $ */
+ /* $Id: class.uicalendar.inc.php,v 1.140 2006/12/09 20:41:46 sigurdne
Exp $ */
class uicalendar
{
@@ -360,7 +360,7 @@
{
$printer = '';
$param =
'&year='.$this->bo->year.'&month='.$this->bo->month.'&friendly=1';
- $print = '<a
href="'.$this->page('month'.$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
+ $print = '<a
href="'.$this->page('month',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
}
else
{
@@ -449,7 +449,7 @@
$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>';
- $print = '<a
href="'.$this->page('week'.$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
+ $print = '<a
href="'.$this->page('week',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
}
else
{
@@ -517,7 +517,7 @@
$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>';
$link = 'day';
- $printer = '<a
href="'.$this->page('year'.$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
+ $printer = '<a
href="'.$this->page('year',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
}
else
{
@@ -1125,7 +1125,7 @@
{
$printer = '';
$param =
'&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>';
+ $print = '<a
href="'.$this->page('day',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
}
else
{
@@ -2283,11 +2283,25 @@
{
$page_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
+
if ( !is_array($params) )
{
- parse_str($params, $new_params);
- $params =& $new_params;
+// parse_str($params, $new_params);
+// $params =& $new_params;
+ $params = explode('&', $params);
+ foreach( $params as $v )
+ {
+ $b = split('=', $v);
+ if(isset($b[0]) && $b[0])
+ {
+ $new_params[$b[0]] = $b[1];
}
+ }
+ unset($params);
+ $params = (isset($new_params)?$new_params:'');
+ unset($new_params);
+ }
+//_debug_array($params);
$params['menuaction'] =
"{$page_app}.ui{$page_app}.{$_page}";
return $GLOBALS['phpgw']->link('/index.php', $params,
$redirect);
}
- [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 <=
- [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/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