[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/templates/justweb header.inc.php,1.17,1
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/templates/justweb header.inc.php,1.17,1.18 |
|
Date: |
Sat, 17 Aug 2002 11:36:12 -0400 |
Update of /cvsroot/phpgroupware/calendar/templates/justweb
In directory subversions:/tmp/cvs-serv31555/justweb
Modified Files:
header.inc.php
Log Message:
A couple more fixes and even a speed enhancement.
Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/justweb/header.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** header.inc.php 5 Apr 2002 13:56:08 -0000 1.17
--- header.inc.php 17 Aug 2002 15:36:10 -0000 1.18
***************
*** 23,27 ****
}
! $refer = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
$referrer = $refer[2];
--- 23,27 ----
}
! $refer = explode('.',MENUACTION);
$referrer = $refer[2];
***************
*** 46,50 ****
}
! $today = date('Ymd',time());
$col_width = 12;
--- 46,50 ----
}
! $today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
$col_width = 12;
***************
*** 52,70 ****
add_col($tpl,' <td width="2%"> </td>');
! add_col($tpl,' <td
width="2%">'.add_image_ahref($this->page('day','&date='.$today),'today.gif',lang('Today')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('week','&date='.$today),'week.gif',lang('This
week')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('month','&date='.$today),'month.gif',lang('This
month')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('year','&date='.$today),'year.gif',lang('This
Year')).'</td>');
if(floor(phpversion()) >= 4)
{
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner.gif',lang('Planner')).'</td>');
$col_width += 2;
}
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('matrixselect'),'view.gif',lang('Daily
Matrix View')).'</td>');
add_col($tpl,' <td width="'.(100 - $col_width).'%"
align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'> </td>');
--- 52,70 ----
add_col($tpl,' <td width="2%"> </td>');
! add_col($tpl,' <td
width="2%">'.add_image_ahref($this->page('day','&date='.$today),'today',lang('Today')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('week','&date='.$today),'week',lang('This
week')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('month','&date='.$today),'month',lang('This
month')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('year','&date='.$today),'year',lang('This
Year')).'</td>');
if(floor(phpversion()) >= 4)
{
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner',lang('Planner')).'</td>');
$col_width += 2;
}
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('matrixselect'),'view',lang('Daily
Matrix View')).'</td>');
add_col($tpl,' <td width="'.(100 - $col_width).'%"
align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'> </td>');
***************
*** 78,103 ****
{
$remainder = 72;
! $hidden_vars = '<input type="hidden" name="from"
value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
! if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) &&
$GLOBALS['HTTP_GET_VARS']['cal_id'] != 0)
! {
! $hidden_vars .= ' <input type="hidden" name="cal_id"
value="'.$GLOBALS['HTTP_GET_VARS']['cal_id'].'">'."\n";
! }
! if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) &&
$GLOBALS['HTTP_POST_VARS']['keywords'])
{
! $hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'">'."\n";
! }
! if(isset($GLOBALS['HTTP_POST_VARS']['matrixtype']) &&
$GLOBALS['HTTP_POST_VARS']['matrixtype'])
! {
! $hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$GLOBALS['HTTP_POST_VARS']['matrixtype'].'">'."\n";
}
! if(isset($GLOBALS['HTTP_POST_VARS']['participants']) &&
$GLOBALS['HTTP_POST_VARS']['participants'])
{
! for
($i=0;$i<count($GLOBALS['HTTP_POST_VARS']['participants']);$i++)
{
! $hidden_vars .= ' <input type="hidden"
name="participants[]"
value="'.$GLOBALS['HTTP_POST_VARS']['participants'][$i].'">'."\n";
}
}
- if($this->debug) { echo 'Cat ID =
('.$this->bo->cat_id.")<br>\n"; }
$var = Array(
--- 78,119 ----
{
$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'));
+ $var_list = Array(
+ 'cal_id',
+ 'keywords',
+ 'matrixtype'
+ );
! $base_hidden_vars = '<input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
! for($i=0;$i<count($var_list);$i++)
{
! if($($var_list[$i]))
! {
! $base_hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$($var_list[$i]).'">'."\n";
! }
}
! // if($cal_id != 0)
! // {
! // $base_hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$cal_id.'">'."\n";
! // }
! // if($keywords)
! // {
! // $base_hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$keywords.'">'."\n";
! // }
! // if($matrixtype)
! // {
! // $base_hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$matrixtype.'">'."\n";
! // }
! $hidden_vars = '';
! if($participants)
{
! for ($i=0;$i<count($participants);$i++)
{
! $hidden_vars .= ' <input type="hidden"
name="participants[]" value="'.$participants[$i].'">'."\n";
}
}
$var = Array(
***************
*** 106,110 ****
'form_name' => 'cat_id',
'title' => lang('Category'),
! 'hidden_vars' => $hidden_vars,
'form_options' => '<option
value="0">All</option>'.$this->cat->formated_list('select','all',$this->bo->cat_id,'True'),
'button_value' => lang('Go!')
--- 122,126 ----
'form_name' => 'cat_id',
'title' => lang('Category'),
! 'hidden_vars' => $base_hidden_vars.$hidden_vars,
'form_options' => '<option
value="0">All</option>'.$this->cat->formated_list('select','all',$this->bo->cat_id,'True'),
'button_value' => lang('Go!')
***************
*** 117,144 ****
{
$remainder -= 28;
! $hidden_vars = '<input type="hidden" name="from"
value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
! if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) &&
$GLOBALS['HTTP_GET_VARS']['cal_id'] != 0)
! {
! $hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$GLOBALS['HTTP_GET_VARS']['cal_id'].'">'."\n";
! }
! if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) &&
$GLOBALS['HTTP_POST_VARS']['keywords'])
! {
! $hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'">'."\n";
! }
! if(isset($GLOBALS['HTTP_POST_VARS']['matrixtype']) &&
$GLOBALS['HTTP_POST_VARS']['matrixtype'])
{
! $hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$GLOBALS['HTTP_POST_VARS']['matrixtype'].'">'."\n";
! }
! if(isset($GLOBALS['HTTP_POST_VARS']['participants']) &&
$GLOBALS['HTTP_POST_VARS']['participants'])
! {
! for
($i=0;$i<count($GLOBALS['HTTP_POST_VARS']['participants']);$i++)
{
! $hidden_vars .= ' <input
type="hidden" name="participants[]"
value="'.$GLOBALS['HTTP_POST_VARS']['participants'][$i].'">'."\n";
}
}
- if($this->debug) { echo 'Filter =
('.$this->bo->filter.")<br>\n"; }
$form_options = '<option value=" all
"'.($this->bo->filter==' all '?' selected':'').'>'.lang('All').'</option>'."\n";
$form_options .= ' <option value=" private
"'.((!isset($this->bo->filter) || !$this->bo->filter) || $this->bo->filter=='
private '?' selected':'').'>'.lang('Private Only').'</option>'."\n";
!
$var = Array(
'form_width' => '28',
--- 133,147 ----
{
$remainder -= 28;
! $hidden_vars = '';
! if($participants)
{
! for ($i=0;$i<count($participants);$i++)
{
! $hidden_vars .= ' <input
type="hidden" name="participants[]" value="'.$participants[$i].'">'."\n";
}
}
$form_options = '<option value=" all
"'.($this->bo->filter==' all '?' selected':'').'>'.lang('All').'</option>'."\n";
$form_options .= ' <option value=" private
"'.((!isset($this->bo->filter) || !$this->bo->filter) || $this->bo->filter=='
private '?' selected':'').'>'.lang('Private Only').'</option>'."\n";
!
$var = Array(
'form_width' => '28',
***************
*** 146,150 ****
'form_name' => 'filter',
'title' => lang('Filter'),
! 'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
--- 149,153 ----
'form_name' => 'filter',
'title' => lang('Filter'),
! 'hidden_vars' =>
$base_hidden_vars.$hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
***************
*** 157,170 ****
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 = ' <input type="hidden" name="from"
value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
- if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) &&
$GLOBALS['HTTP_POST_VARS']['keywords'])
- {
- $hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'">'."\n";
- }
- if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) &&
$GLOBALS['HTTP_GET_VARS']['cal_id'] != 0)
- {
- $hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$GLOBALS['HTTP_GET_VARS']['cal_id'].'">'."\n";
- }
- $hidden_vars .= ' <!-- BO Owner =
'.$this->bo->owner.' -->'."\n";
$form_options = '';
reset($this->bo->grants);
--- 160,163 ----
***************
*** 199,203 ****
}
}
!
@reset($drop_down);
@ksort($drop_down);
--- 192,196 ----
}
}
!
@reset($drop_down);
@ksort($drop_down);
***************
*** 205,209 ****
{
$form_options .= ' <option
value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?'
selected':'').'>'.$grant['name'].'</option>'."\n";
! }
reset($this->bo->grants);
--- 198,202 ----
{
$form_options .= ' <option
value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?'
selected':'').'>'.$grant['name'].'</option>'."\n";
! }
reset($this->bo->grants);
***************
*** 213,217 ****
'form_name' => 'owner',
'title' => lang('User'),
! 'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
--- 206,210 ----
'form_name' => 'owner',
'title' => lang('User'),
! 'hidden_vars' => $base_hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
***************
*** 222,230 ****
}
}
!
! $hidden_vars = ' <input type="hidden" name="from"
value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
! if(isset($GLOBALS['HTTP_GET_VARS']['date']) &&
$GLOBALS['HTTP_GET_VARS']['date'])
{
! $hidden_vars .= ' <input type="hidden" name="date"
value="'.$GLOBALS['HTTP_GET_VARS']['date'].'">'."\n";
}
$hidden_vars .= ' <input type="hidden" name="month"
value="'.$this->bo->month.'">'."\n";
--- 215,224 ----
}
}
!
! $hidden_vars = ' <input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
! $date = get_var('date',Array('GET'));
! if($date)
{
! $hidden_vars .= ' <input type="hidden" name="date"
value="'.$date.'">'."\n";
}
$hidden_vars .= ' <input type="hidden" name="month"
value="'.$this->bo->month.'">'."\n";
***************
*** 235,239 ****
$hidden_vars .= ' <input type="hidden" name="filter"
value="'.$this->bo->filter.'">'."\n";
}
! $hidden_vars .= ' <input
name="keywords"'.($GLOBALS['HTTP_POST_VARS']['keywords']?'
value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'"':'').'>';
$var = Array(
--- 229,233 ----
$hidden_vars .= ' <input type="hidden" name="filter"
value="'.$this->bo->filter.'">'."\n";
}
! $hidden_vars .= ' <input name="keywords"'.($keywords?'
value="'.$keywords.'"':'').'>';
$var = Array(
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/templates/justweb header.inc.php,1.17,1.18,
Mark A Peters <address@hidden> <=