This commit is contained in:
skeeter 2002-04-05 13:56:08 +00:00
parent 1ffc7e1ecc
commit ac09ef4711
4 changed files with 434 additions and 435 deletions

View File

@ -74,6 +74,8 @@
$tpl->set_var('header_column',''); $tpl->set_var('header_column','');
$tpl->set_var('cols',$cols); $tpl->set_var('cols',$cols);
if($referrer!='view')
{
$remainder = 72; $remainder = 72;
$hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n"; $hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
@ -171,8 +173,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $grantor, 'grantor' => $grantor,
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
. $grantor,
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
} }
@ -182,8 +183,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $group_info['account_id'], 'grantor' => $group_info['account_id'],
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
.$group_info['account_id'],
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
@ -193,8 +193,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $group_id, 'grantor' => $group_id,
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
.$group_id,
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
} }
@ -221,6 +220,7 @@
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown')); $tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
$tpl->parse('header_column','head_col',True); $tpl->parse('header_column','head_col',True);
} }
}
$hidden_vars = ' <input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n"; $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']) if(isset($GLOBALS['HTTP_GET_VARS']['date']) && $GLOBALS['HTTP_GET_VARS']['date'])
@ -235,7 +235,6 @@
$hidden_vars .= ' <input type="hidden" name="filter" value="'.$this->bo->filter.'">'."\n"; $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'].'"':'').'>'; $hidden_vars .= ' <input name="keywords"'.($GLOBALS['HTTP_POST_VARS']['keywords']?' value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'"':'').'>';
$var = Array( $var = Array(
'action_url_button' => $this->page('search'), 'action_url_button' => $this->page('search'),
'action_text_button' => lang('Search'), 'action_text_button' => lang('Search'),

View File

@ -74,6 +74,8 @@
$tpl->set_var('header_column',''); $tpl->set_var('header_column','');
$tpl->set_var('cols',$cols); $tpl->set_var('cols',$cols);
if($referrer!='view')
{
$remainder = 72; $remainder = 72;
$hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n"; $hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
@ -171,8 +173,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $grantor, 'grantor' => $grantor,
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
. $grantor,
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
} }
@ -182,8 +183,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $group_info['account_id'], 'grantor' => $group_info['account_id'],
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
.$group_info['account_id'],
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
@ -193,8 +193,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $group_id, 'grantor' => $group_id,
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
.$group_id,
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
} }
@ -221,6 +220,7 @@
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown')); $tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
$tpl->parse('header_column','head_col',True); $tpl->parse('header_column','head_col',True);
} }
}
$hidden_vars = ' <input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n"; $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']) if(isset($GLOBALS['HTTP_GET_VARS']['date']) && $GLOBALS['HTTP_GET_VARS']['date'])

View File

@ -74,6 +74,8 @@
$tpl->set_var('header_column',''); $tpl->set_var('header_column','');
$tpl->set_var('cols',$cols); $tpl->set_var('cols',$cols);
if($referrer!='view')
{
$remainder = 72; $remainder = 72;
$hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n"; $hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
@ -171,8 +173,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $grantor, 'grantor' => $grantor,
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
. $grantor,
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
} }
@ -182,8 +183,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $group_info['account_id'], 'grantor' => $group_info['account_id'],
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
.$group_info['account_id'],
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
@ -193,8 +193,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $group_id, 'grantor' => $group_id,
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
.$group_id,
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
} }
@ -221,6 +220,7 @@
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown')); $tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
$tpl->parse('header_column','head_col',True); $tpl->parse('header_column','head_col',True);
} }
}
$hidden_vars = ' <input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n"; $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']) if(isset($GLOBALS['HTTP_GET_VARS']['date']) && $GLOBALS['HTTP_GET_VARS']['date'])

View File

@ -74,6 +74,8 @@
$tpl->set_var('header_column',''); $tpl->set_var('header_column','');
$tpl->set_var('cols',$cols); $tpl->set_var('cols',$cols);
if($referrer!='view')
{
$remainder = 72; $remainder = 72;
$hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n"; $hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
@ -171,8 +173,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $grantor, 'grantor' => $grantor,
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
. $grantor,
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
} }
@ -182,8 +183,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $group_info['account_id'], 'grantor' => $group_info['account_id'],
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
.$group_info['account_id'],
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
@ -193,8 +193,7 @@
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname); $GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
$drop_down[$lname.' '.$fname] = Array( $drop_down[$lname.' '.$fname] = Array(
'grantor' => $group_id, 'grantor' => $group_id,
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'') 'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
.$group_id,
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname) 'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
); );
} }
@ -221,6 +220,7 @@
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown')); $tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
$tpl->parse('header_column','head_col',True); $tpl->parse('header_column','head_col',True);
} }
}
$hidden_vars = ' <input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n"; $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']) if(isset($GLOBALS['HTTP_GET_VARS']['date']) && $GLOBALS['HTTP_GET_VARS']['date'])