[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/templates/default header.inc.php,1.18.2
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/templates/default header.inc.php,1.18.2.3,1.18.2.4 |
|
Date: |
Sat, 17 Aug 2002 11:23:33 -0400 |
Update of /cvsroot/phpgroupware/calendar/templates/default
In directory subversions:/tmp/cvs-serv30892/default
Modified Files:
Tag: Version-0_9_14-branch
header.inc.php
Log Message:
A couple more fixes and even a speed enhancement.
Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/header.inc.php,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -C2 -r1.18.2.3 -r1.18.2.4
*** header.inc.php 17 Aug 2002 04:30:45 -0000 1.18.2.3
--- header.inc.php 17 Aug 2002 15:23:31 -0000 1.18.2.4
***************
*** 46,50 ****
}
! $today = date('Ymd',$GLOBALS['phpgw']['datetime']->users_localtime);
$col_width = 12;
--- 46,50 ----
}
! $today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
$col_width = 12;
***************
*** 79,94 ****
$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'])
--- 79,94 ----
$remainder = 72;
! $base_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)
{
! $base_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'])
{
! $base_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'])
{
! $base_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'])
***************
*** 96,103 ****
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(
--- 96,102 ----
for
($i=0;$i<count($GLOBALS['HTTP_POST_VARS']['participants']);$i++)
{
! $base_hidden_vars .= ' <input type="hidden"
name="participants[]"
value="'.$GLOBALS['HTTP_POST_VARS']['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!')
--- 105,109 ----
'form_name' => 'cat_id',
'title' => lang('Category'),
! 'hidden_vars' => $base_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,141 ****
{
$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";
--- 116,119 ----
***************
*** 146,150 ****
'form_name' => 'filter',
'title' => lang('Filter'),
! 'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
--- 124,128 ----
'form_name' => 'filter',
'title' => lang('Filter'),
! 'hidden_vars' => $base_hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
***************
*** 157,181 ****
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";
- }
- 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";
- }
- }
- $hidden_vars .= ' <!-- BO Owner =
'.$this->bo->owner.' -->'."\n";
$form_options = '';
reset($this->bo->grants);
--- 135,138 ----
***************
*** 224,228 ****
'form_name' => 'owner',
'title' => lang('User'),
! 'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
--- 181,185 ----
'form_name' => 'owner',
'title' => lang('User'),
! 'hidden_vars' => $base_hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/templates/default header.inc.php,1.18.2.3,1.18.2.4,
Mark A Peters <address@hidden> <=