extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:04:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes to possibly fix a problem with the uicalendar->page().

Browse Source
This commit is contained in:
skeeter 2001-10-02 01:13:53 +00:00
parent bb0cfbf43e
commit 07e4e05d11
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,9 +131,12 @@
echo "Owner : ".$this->owner."<br>\n"; echo "Owner : ".$this->owner."<br>\n";
} }
if(isset($GLOBALS['owner'])) $owner = (isset($GLOBALS['HTTP_GET_VARS']['owner'])?$GLOBALS['HTTP_GET_VARS']['owner']:'');
$owner = ($owner=='' && isset($GLOBALS['HTTP_POST_VARS']['owner'])?$GLOBALS['HTTP_POST_VARS']['owner']:$owner);
if(isset($owner))
{ {
$this->owner = intval($GLOBALS['owner']); $this->owner = intval($owner);
} }
elseif(!@isset($this->owner) || !@$this->owner) elseif(!@isset($this->owner) || !@$this->owner)
{ {
@ -154,7 +157,10 @@
$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'];
$this->printer_friendly = ($GLOBALS['friendly'] == 1?True:False); $friendly = (isset($GLOBALS['HTTP_GET_VARS']['friendly'])?$GLOBALS['HTTP_GET_VARS']['friendly']:'');
$friendly = ($friendly=='' && isset($GLOBALS['HTTP_POST_VARS']['friendly'])?$GLOBALS['HTTP_POST_VARS']['friendly']:$friendly);
$this->printer_friendly = (intval($friendly) == 1?True:False);
if(isset($GLOBALS['HTTP_POST_VARS']['filter'])) { $this->filter = $GLOBALS['HTTP_POST_VARS']['filter']; } if(isset($GLOBALS['HTTP_POST_VARS']['filter'])) { $this->filter = $GLOBALS['HTTP_POST_VARS']['filter']; }
if(isset($GLOBALS['HTTP_POST_VARS']['cat_id'])) { $this->cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id']; } if(isset($GLOBALS['HTTP_POST_VARS']['cat_id'])) { $this->cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id']; }

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

@ -1415,15 +1415,15 @@
$p->parse($row,$list,True); $p->parse($row,$list,True);
} }
function page($page='',$params='') function page($_page='',$params='')
{ {
if($page == '') if($_page == '')
{ {
$page_ = explode('.',$this->bo->prefs['calendar']['defaultcalendar']); $page_ = explode('.',$this->bo->prefs['calendar']['defaultcalendar']);
$page = $page_[0]; $_page = $page_[0];
if ($page=='index' || ($page != 'day' && $page != 'week' && $page != 'month' && $page != 'year')) if ($_page=='index' || ($_page != 'day' && $_page != 'week' && $_page != 'month' && $_page != 'year'))
{ {
$page = 'month'; $_page = 'month';
$GLOBALS['phpgw']->preferences->add('calendar','defaultcalendar','month'); $GLOBALS['phpgw']->preferences->add('calendar','defaultcalendar','month');
$GLOBALS['phpgw']->preferences->save_repository(); $GLOBALS['phpgw']->preferences->save_repository();
} }
@ -1436,7 +1436,7 @@
{ {
$page_app = $GLOBALS['phpgw_info']['flags']['currentapp']; $page_app = $GLOBALS['phpgw_info']['flags']['currentapp'];
} }
return $GLOBALS['phpgw']->link('/index.php','menuaction='.$page_app.'.ui'.$page_app.'.'.$page.$params); return $GLOBALS['phpgw']->link('/index.php','menuaction='.$page_app.'.ui'.$page_app.'.'.$_page.$params);
} }
function header() function header()