small fix for the getAccounts function to use the name-style defined in the user prefs by default

This commit is contained in:
Ralf Becker 2003-10-23 20:30:32 +00:00
parent fb95b258d4
commit 8e1c003cde

View File

@ -519,13 +519,11 @@
* Function: Allows to select one accountname * Function: Allows to select one accountname
* Parameters: $name string with name of the submitted var, which holds the account_id or 0 after submit * Parameters: $name string with name of the submitted var, which holds the account_id or 0 after submit
* $id account_id of already selected account * $id account_id of already selected account
* $longnames 0=account_lid 1=firstname lastname * $longnames -1=as user prefs, 0=account_lid 1=firstname lastname
*/ */
function getAccount($name,$id,$longnames=0,$type='accounts',$multiple=0,$options='') function getAccount($name,$id,$longnames=-1,$type='accounts',$multiple=0,$options='')
{ {
$accounts = createobject('phpgwapi.accounts'); $accs = $GLOBALS['phpgw']->accounts->get_list($type);
$accounts->db = $GLOBALS['phpgw']->db;
$accs = $accounts->get_list($type);
if ($multiple < 0) if ($multiple < 0)
{ {
@ -533,7 +531,10 @@
} }
while ($a = current($accs)) while ($a = current($accs))
{ {
$aarr[$a['account_id']] = $this->accountInfo($a['account_id'],$a,$longnames,$type=='both'); $aarr[$a['account_id']] = $longnames == -1 ?
$GLOBALS['phpgw']->common->display_fullname($a['account_lid'],$a['account_firstname'],$a['account_lastname']) :
$this->accountInfo($a['account_id'],$a,$longnames,$type=='both');
next($accs); next($accs);
} }
return $this->getArrayItem($name,$id,$aarr,1,$options,$multiple); return $this->getArrayItem($name,$id,$aarr,1,$options,$multiple);