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

* userModel: the getContactLists method return different result based on the $mode parameter.

Browse Source
This commit is contained in:
liugang
2023-07-08 10:30:20 +08:00
parent 0e5072054f
commit cabf508ca7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/model.php
+8 -7
View File
@@ -1443,19 +1443,20 @@ class userModel extends model
/**
* Get contact list of a user.
*
* @param string $account
* @param string $params withempty|withnote
*
* @param string $account
* @param string $params withempty|withnote
* @param string $mode pairs|list
* @access public
* @return array
*/
public function getContactLists($account, $params = '')
public function getContactLists(string $account, string $params = '', string $mode = 'pairs'): array
{
$contacts = $this->dao->select('id, listName')->from(TABLE_USERCONTACT)
$this->dao->select('id, listName')->from(TABLE_USERCONTACT)
->where('account')->eq($account)
->orWhere('public')->eq(1)
->orderBy('public, id_desc')
->fetchPairs();
->orderBy('public, id_desc');
$contacts = $mode == 'pairs' ? $this->dao->fetchPairs() : $this->dao->fetchAll();
if(empty($contacts)) return array();
if(strpos($params, 'withempty') !== false) $contacts = array('' => '') + $contacts;