mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-26 21:01:30 +02:00
GNU Patch #217.
This commit is contained in:
parent
1ffc7e1ecc
commit
ac09ef4711
@ -74,6 +74,8 @@
|
||||
$tpl->set_var('header_column','');
|
||||
$tpl->set_var('cols',$cols);
|
||||
|
||||
if($referrer!='view')
|
||||
{
|
||||
$remainder = 72;
|
||||
|
||||
$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);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $grantor,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'')
|
||||
. $grantor,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
|
||||
'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);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $group_info['account_id'],
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'')
|
||||
.$group_info['account_id'],
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
|
||||
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
|
||||
);
|
||||
|
||||
@ -193,8 +193,7 @@
|
||||
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $group_id,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'')
|
||||
.$group_id,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
|
||||
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
|
||||
);
|
||||
}
|
||||
@ -221,6 +220,7 @@
|
||||
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
|
||||
$tpl->parse('header_column','head_col',True);
|
||||
}
|
||||
}
|
||||
|
||||
$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'])
|
||||
@ -235,7 +235,6 @@
|
||||
$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(
|
||||
'action_url_button' => $this->page('search'),
|
||||
'action_text_button' => lang('Search'),
|
||||
|
@ -74,6 +74,8 @@
|
||||
$tpl->set_var('header_column','');
|
||||
$tpl->set_var('cols',$cols);
|
||||
|
||||
if($referrer!='view')
|
||||
{
|
||||
$remainder = 72;
|
||||
|
||||
$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);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $grantor,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'')
|
||||
. $grantor,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
|
||||
'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);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $group_info['account_id'],
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'')
|
||||
.$group_info['account_id'],
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
|
||||
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
|
||||
);
|
||||
|
||||
@ -193,8 +193,7 @@
|
||||
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $group_id,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'')
|
||||
.$group_id,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
|
||||
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
|
||||
);
|
||||
}
|
||||
@ -221,6 +220,7 @@
|
||||
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
|
||||
$tpl->parse('header_column','head_col',True);
|
||||
}
|
||||
}
|
||||
|
||||
$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'])
|
||||
|
@ -74,6 +74,8 @@
|
||||
$tpl->set_var('header_column','');
|
||||
$tpl->set_var('cols',$cols);
|
||||
|
||||
if($referrer!='view')
|
||||
{
|
||||
$remainder = 72;
|
||||
|
||||
$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);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $grantor,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'')
|
||||
. $grantor,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
|
||||
'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);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $group_info['account_id'],
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'')
|
||||
.$group_info['account_id'],
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
|
||||
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
|
||||
);
|
||||
|
||||
@ -193,8 +193,7 @@
|
||||
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $group_id,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'')
|
||||
.$group_id,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
|
||||
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
|
||||
);
|
||||
}
|
||||
@ -221,6 +220,7 @@
|
||||
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
|
||||
$tpl->parse('header_column','head_col',True);
|
||||
}
|
||||
}
|
||||
|
||||
$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'])
|
||||
|
@ -74,6 +74,8 @@
|
||||
$tpl->set_var('header_column','');
|
||||
$tpl->set_var('cols',$cols);
|
||||
|
||||
if($referrer!='view')
|
||||
{
|
||||
$remainder = 72;
|
||||
|
||||
$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);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $grantor,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'')
|
||||
. $grantor,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
|
||||
'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);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $group_info['account_id'],
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'')
|
||||
.$group_info['account_id'],
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
|
||||
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
|
||||
);
|
||||
|
||||
@ -193,8 +193,7 @@
|
||||
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
|
||||
$drop_down[$lname.' '.$fname] = Array(
|
||||
'grantor' => $group_id,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'')
|
||||
.$group_id,
|
||||
'value' => ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
|
||||
'name' => $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
|
||||
);
|
||||
}
|
||||
@ -221,6 +220,7 @@
|
||||
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
|
||||
$tpl->parse('header_column','head_col',True);
|
||||
}
|
||||
}
|
||||
|
||||
$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'])
|
||||
|
Loading…
x
Reference in New Issue
Block a user