Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* userModel: simplify the getContactLists method.

Browse Source
This commit is contained in:
liugang
2023-07-08 10:06:24 +08:00
parent b04afd46ff
commit e80b53a681
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/model.php
+5 -14
View File
@@ -1451,20 +1451,11 @@ class userModel extends model
*/
public function getContactLists($account, $params = '')
{
$contacts = $this->getListByAccount($account);
$globalIDs = isset($this->config->my->global->globalContacts) ? $this->config->my->global->globalContacts : '';
if(!empty($globalIDs))
{
$globalIDs = explode(',', $globalIDs);
$globalContacts = $this->dao->select('id, listName')->from(TABLE_USERCONTACT)->where('id')->in($globalIDs)->fetchPairs();
foreach($globalContacts as $id => $contact)
{
if(in_array($id, array_keys($contacts))) unset($globalContacts[$id]);
}
if(!empty($globalContacts)) $contacts = $globalContacts + $contacts;
}
$contacts = $this->dao->select('id, listName')->from(TABLE_USERCONTACT)
->where('account')->eq($account)
->orWhere('public')->eq(1)
->orderBy('public, id_desc')
->fetchPairs();
if(empty($contacts)) return array();
if(strpos($params, 'withempty') !== false) $contacts = array('' => '') + $contacts;