From 2926f5d0db354b2e7873e1a43cda1f8436ff277e Mon Sep 17 00:00:00 2001 From: skeeter Date: Sat, 17 Aug 2002 04:25:25 +0000 Subject: [PATCH] Brings it in line with the new API functions. --- calendar/templates/idsociety/header.inc.php | 71 ++++++++++++--------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/calendar/templates/idsociety/header.inc.php b/calendar/templates/idsociety/header.inc.php index dd7179786b..18443944f0 100755 --- a/calendar/templates/idsociety/header.inc.php +++ b/calendar/templates/idsociety/header.inc.php @@ -22,7 +22,7 @@ return ''.$alt.''; } - $refer = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']); + $refer = explode('.',MENUACTION); $referrer = $refer[2]; $templates = Array( @@ -45,7 +45,7 @@ $tpl->set_var('cols',7); } - $today = date('Ymd',time()); + $today = date('Ymd',$GLOBALS['phpgw']['datetime']->users_localtime); $col_width = 12; @@ -77,25 +77,29 @@ if($referrer!='view') { $remainder = 72; + $cal_id = get_var('cal_id',Array('GET','DEFAULT'),0); + $keywords = get_var('keywords',Array('POST','DEFAULT'),''); + $matrixtype = get_var('matrixtype',Array('POST','DEFAULT'),''); + $participants = get_var('participants',Array('POST')); - $hidden_vars = ''."\n"; - if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) && $GLOBALS['HTTP_GET_VARS']['cal_id'] != 0) + $hidden_vars = ''."\n"; + if($cal_id != 0) { - $hidden_vars .= ' '."\n"; + $hidden_vars .= ' '."\n"; } - if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) && $GLOBALS['HTTP_POST_VARS']['keywords']) + if($keywords) { - $hidden_vars .= ' '."\n"; + $hidden_vars .= ' '."\n"; } - if(isset($GLOBALS['HTTP_POST_VARS']['matrixtype']) && $GLOBALS['HTTP_POST_VARS']['matrixtype']) + if($matrixtype) { - $hidden_vars .= ' '."\n"; + $hidden_vars .= ' '."\n"; } - if(isset($GLOBALS['HTTP_POST_VARS']['participants']) && $GLOBALS['HTTP_POST_VARS']['participants']) + if($participants) { - for ($i=0;$i'."\n"; + $hidden_vars .= ' '."\n"; } } if($this->debug) { echo 'Cat ID = ('.$this->bo->cat_id.")
\n"; } @@ -116,24 +120,24 @@ if($this->bo->check_perms(PHPGW_ACL_PRIVATE)) { $remainder -= 28; - $hidden_vars = ''."\n"; - if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) && $GLOBALS['HTTP_GET_VARS']['cal_id'] != 0) + $hidden_vars = ''."\n"; + if($cal_id) { - $hidden_vars .= ' '."\n"; + $hidden_vars .= ' '."\n"; } - if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) && $GLOBALS['HTTP_POST_VARS']['keywords']) + if($keywords) { - $hidden_vars .= ' '."\n"; + $hidden_vars .= ' '."\n"; } - if(isset($GLOBALS['HTTP_POST_VARS']['matrixtype']) && $GLOBALS['HTTP_POST_VARS']['matrixtype']) + if($matrixtype) { - $hidden_vars .= ' '."\n"; + $hidden_vars .= ' '."\n"; } - if(isset($GLOBALS['HTTP_POST_VARS']['participants']) && $GLOBALS['HTTP_POST_VARS']['participants']) + if($participants) { - for ($i=0;$i'."\n"; + $hidden_vars .= ' '."\n"; } } if($this->debug) { echo 'Filter = ('.$this->bo->filter.")
\n"; } @@ -156,14 +160,18 @@ if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || !$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && count($this->bo->grants) > 0) { - $hidden_vars = ' '."\n"; - if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) && $GLOBALS['HTTP_POST_VARS']['keywords']) + $hidden_vars = ' '."\n"; + if($keywords) { - $hidden_vars .= ' '."\n"; + $hidden_vars .= ' '."\n"; } - if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) && $GLOBALS['HTTP_GET_VARS']['cal_id'] != 0) + if($cal_id) { - $hidden_vars .= ' '."\n"; + $hidden_vars .= ' '."\n"; + } + if($matrixtype) + { + $hidden_vars .= ' '."\n"; } $hidden_vars .= ' '."\n"; $form_options = ''; @@ -222,10 +230,11 @@ } } - $hidden_vars = ' '."\n"; - if(isset($GLOBALS['HTTP_GET_VARS']['date']) && $GLOBALS['HTTP_GET_VARS']['date']) + $hidden_vars = ' '."\n"; + $date = get_vars('date',Array('GET')); + if($date) { - $hidden_vars .= ' '."\n"; + $hidden_vars .= ' '."\n"; } $hidden_vars .= ' '."\n"; $hidden_vars .= ' '."\n"; @@ -234,7 +243,7 @@ { $hidden_vars .= ' '."\n"; } - $hidden_vars .= ' '; + $hidden_vars .= ' '; $var = Array( 'action_url_button' => $this->page('search'),