extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed CRM view opened for id=0

Browse Source
This commit is contained in:
Ralf Becker 2021-02-15 17:20:17 +02:00
parent 31b7db5bbe
commit ee6a74a40f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/Contacts.php
View File

@ -2814,7 +2814,7 @@ class Contacts extends Contacts\Storage
* @throws Exception\WrongParameter|\libphonenumber\NumberParseException if $critera is not a string with a valid phone-number * @throws Exception\WrongParameter|\libphonenumber\NumberParseException if $critera is not a string with a valid phone-number
* @throws Exception\NotFound if no contact matches the phone-number in $criteria * @throws Exception\NotFound if no contact matches the phone-number in $criteria
*/ */
function &phoneSearch($criteria, $only_keys = false, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $ignore_acl = false) function &phoneSearch($criteria, $only_keys = false, $order_by = 'contact_modified DESC', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $ignore_acl = false)
{ {
$phoneNumberUtil = PhoneNumberUtil::getInstance(); $phoneNumberUtil = PhoneNumberUtil::getInstance();
$region = $GLOBALS['egw_info']['user']['preferences']['common']['country'] ?: 'DE'; $region = $GLOBALS['egw_info']['user']['preferences']['common']['country'] ?: 'DE';
@ -2859,11 +2859,14 @@ class Contacts extends Contacts\Storage
} }
} }
} }
//if ($found) error_log(__METHOD__."('$criteria') found #$row[id]: $row[n_fn], $name: $value");
if (!$found) unset($rows[$key]); if (!$found) unset($rows[$key]);
} }
if ($rows) if ($rows)
{ {
$this->total = count($rows); $this->total = count($rows);
$rows = array_values($rows);
//error_log(__METHOD__."('$criteria') returning $this->total rows: ".json_encode($rows));
return $rows; return $rows;
} }
} }
@ -2881,7 +2884,7 @@ class Contacts extends Contacts\Storage
{ {
$found = $this->phoneSearch($from); $found = $this->phoneSearch($from);
// ToDo: select best match from multiple matches containing the number // ToDo: select best match from multiple matches containing the number
$contact = $found[0]; $contact = current($found);
$push = new Json\Push($this->user); $push = new Json\Push($this->user);
$extras = [ $extras = [
//'index': ToDo: what's that used for? //'index': ToDo: what's that used for?