extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-22 02:41:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

no longer use old contacts class via egw object, but addressbook_bo directly, fixes diverse warnings caused by old class

Browse Source
This commit is contained in:
Ralf Becker 2016-02-22 17:30:20 +00:00
parent 6de553cf88
commit b65cafc07b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -73,6 +73,13 @@ class accounts_sql
*/ */
private $frontend; private $frontend;
/**
* Instance of contacts object / addressbook_bo, NOT automatic instanciated!
*
* @var addressbook_bo
*/
private $contacts;
/** /**
* does backend allow to change account_lid * does backend allow to change account_lid
*/ */
@ -280,7 +287,8 @@ class accounts_sql
} }
if ($contact_id) if ($contact_id)
{ {
$GLOBALS['egw']->contacts->delete($contact_id,false); // false = allow to delete accounts (!) if (!isset($this->contacts)) $this->contacts = new addressbook_bo();
$this->contacts->delete($contact_id,false); // false = allow to delete accounts (!)
} }
return true; return true;
} }
@ -449,6 +457,7 @@ class accounts_sql
$members = array(); $members = array();
foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp => $name) foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp => $name)
{ {
unset($name);
$members = array_unique(array_merge($members, array_keys((array)$this->members($grp)))); $members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp); if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp);
} }
@ -523,10 +532,10 @@ class accounts_sql
break; break;
} }
} }
if (!is_object($GLOBALS['egw']->contacts)) throw new exception('No $GLOBALS[egw]->contacts!'); if (!isset($this->contacts)) $this->contacts = new addressbook_bo();
$accounts = array(); $accounts = array();
foreach((array) $GLOBALS['egw']->contacts->search($criteria, foreach((array) $this->contacts->search($criteria,
array_merge(array(1,'n_given','n_family','id','created','modified',$this->table.'.account_id AS account_id'),$email_cols), array_merge(array(1,'n_given','n_family','id','created','modified',$this->table.'.account_id AS account_id'),$email_cols),
$order,"account_lid,account_type,account_status,account_expires,account_primary_group,account_description", $order,"account_lid,account_type,account_status,account_expires,account_primary_group,account_description",
$wildcard,false,$query[0] == '!' ? 'AND' : 'OR', $wildcard,false,$query[0] == '!' ? 'AND' : 'OR',
@ -554,7 +563,7 @@ class accounts_sql
); );
} }
} }
$this->total = $GLOBALS['egw']->contacts->total; $this->total = $this->contacts->total;
//error_log(__METHOD__."(".array2string($param).") returning ".count($accounts).'/'.$this->total); //error_log(__METHOD__."(".array2string($param).") returning ".count($accounts).'/'.$this->total);
return $accounts; return $accounts;
} }