extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

rewrote the uiaccountsel class to use the global instance of the accounts class and not it's own

Browse Source
This commit is contained in:
Lars Kneschke 2008-02-08 11:35:20 +00:00
parent 8c8e793fee
commit 581d5b2625
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
phpgwapi/inc/class.uiaccountsel.inc.php
View File

@ -51,7 +51,9 @@ class uiaccountsel extends accounts
*/ */
function uiaccountsel() function uiaccountsel()
{ {
$this->accounts(); // call constructor of extended class #$this->accounts(); // call constructor of extended class
$this->accountsClass = accounts::getInstance();
$this->account_selection = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection']; $this->account_selection = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
// admin group should NOT get limited by none or groupmembers, we use primary_group instead // admin group should NOT get limited by none or groupmembers, we use primary_group instead
@ -162,12 +164,12 @@ class uiaccountsel extends accounts
} }
else else
{ {
$memberships = $this->memberships($GLOBALS['egw_info']['user']['account_id'],true); $memberships = $this->accountsClass->memberships($GLOBALS['egw_info']['user']['account_id'],true);
} }
$select = count($selected) && !isset($selected[0]) ? array_keys($selected) : $selected; $select = count($selected) && !isset($selected[0]) ? array_keys($selected) : $selected;
foreach($memberships as $gid) foreach($memberships as $gid)
{ {
foreach($this->members($gid,true) as $member) foreach($this->accountsClass->members($gid,true) as $member)
{ {
if (!in_array($member,$select)) $select[] = $member; if (!in_array($member,$select)) $select[] = $member;
} }
@ -176,7 +178,7 @@ class uiaccountsel extends accounts
{ {
if ($account_sel == 'primary_group') if ($account_sel == 'primary_group')
{ {
$memberships = $this->memberships($GLOBALS['egw_info']['user']['account_id'],true); $memberships = $this->accountsClass->memberships($GLOBALS['egw_info']['user']['account_id'],true);
} }
$select = array_merge($select,$memberships); $select = array_merge($select,$memberships);
} }
@ -207,7 +209,7 @@ class uiaccountsel extends accounts
{ {
$already_selected[$id] = $GLOBALS['egw']->common->grab_owner_name($id); $already_selected[$id] = $GLOBALS['egw']->common->grab_owner_name($id);
} }
elseif ($this->get_type($id) == 'u') elseif ($this->accountsClass->get_type($id) == 'u')
{ {
$users[$id] = !is_array($val) ? $GLOBALS['egw']->common->grab_owner_name($id) : $users[$id] = !is_array($val) ? $GLOBALS['egw']->common->grab_owner_name($id) :
$GLOBALS['egw']->common->display_fullname( $GLOBALS['egw']->common->display_fullname(
@ -437,9 +439,9 @@ function addOption(id,label,value,do_onchange)
if ($app) if ($app)
{ {
$app_groups = $this->split_accounts($app,'groups'); $app_groups = $this->accountsClass->split_accounts($app,'groups');
} }
$all_groups = $this->search(array( $all_groups = $this->accountsClass->search(array(
'type' => 'groups', 'type' => 'groups',
)); ));
foreach($all_groups as $group) foreach($all_groups as $group)
@ -476,7 +478,7 @@ function addOption(id,label,value,do_onchange)
$link_data['group_id'] = $group_id; // reset it $link_data['group_id'] = $group_id; // reset it
// --------------------------------- nextmatch --------------------------- // --------------------------------- nextmatch ---------------------------
$users = $this->search(array( $users = $this->accountsClass->search(array(
'type' => $group_id ? $group_id : $use, 'type' => $group_id ? $group_id : $use,
'app' => $app, 'app' => $app,
'start' => $start, 'start' => $start,
@ -487,11 +489,11 @@ function addOption(id,label,value,do_onchange)
)); ));
$GLOBALS['egw']->template->set_var(array( $GLOBALS['egw']->template->set_var(array(
'left' => $this->nextmatchs->left('/index.php',$start,$this->total,$link_data+array('query'=>$query)), 'left' => $this->nextmatchs->left('/index.php',$start,$this->accountsClass->total,$link_data+array('query'=>$query)),
'right' => $this->nextmatchs->right('/index.php',$start,$this->total,$link_data+array('query'=>$query)), 'right' => $this->nextmatchs->right('/index.php',$start,$this->accountsClass->total,$link_data+array('query'=>$query)),
'lang_showing' => ($group_id ? $GLOBALS['egw']->common->grab_owner_name($group_id).': ' : ''). 'lang_showing' => ($group_id ? $GLOBALS['egw']->common->grab_owner_name($group_id).': ' : '').
($query ? lang("Search %1 '%2'",lang($this->query_types[$query_type]),$query).': ' : '') ($query ? lang("Search %1 '%2'",lang($this->accountsClass->query_types[$query_type]),$query).': ' : '')
.$this->nextmatchs->show_hits($this->total,$start), .$this->nextmatchs->show_hits($this->accountsClass->total,$start),
)); ));
// -------------------------- end nextmatch ------------------------------------ // -------------------------- end nextmatch ------------------------------------
@ -520,7 +522,7 @@ function addOption(id,label,value,do_onchange)
} }
$GLOBALS['egw']->template->set_var('accountsel_icon',$this->html->image('phpgwapi','users-big')); $GLOBALS['egw']->template->set_var('accountsel_icon',$this->html->image('phpgwapi','users-big'));
$GLOBALS['egw']->template->set_var('query_type',is_array($this->query_types) ? $this->html->select('query_type',$query_type,$this->query_types) : ''); $GLOBALS['egw']->template->set_var('query_type',is_array($this->accountsClass->query_types) ? $this->html->select('query_type',$query_type,$this->accountsClass->query_types) : '');
$link_data['query_type'] = 'start'; $link_data['query_type'] = 'start';
$letters = lang('alphabet'); $letters = lang('alphabet');