beenull/abook_carddav_squirrelmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "add nickname"

Browse source 
This reverts commit 7e6e77b626.
This commit is contained in:
Alexey Shpakovsky 2021-05-30 17:29:07 +02:00
parent 7e6e77b626
commit 7f0f8c634d
No known key found for this signature in database
GPG key ID: 5797A726A2A4230A
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
abook_class.php
View file

@ -68,8 +68,8 @@ class abook_carddav extends addressbook_backend {
$nickname = substr($uri, $this->abook_uri_len); $nickname = substr($uri, $this->abook_uri_len);
$label = (string)$vcard->ORG; $label = (string)$vcard->ORG;
} else { } else {
$nickname = (string)$vcard->NICKNAME; $nickname = (string)$vcard->ORG;
$label = (string)$vcard->ORG; $label = '';
} }
if(!$email) { if(!$email) {
$email = (string)$vcard->EMAIL; $email = (string)$vcard->EMAIL;
@ -103,7 +103,7 @@ class abook_carddav extends addressbook_backend {
*/ */
function run_query($query, $match_all=false, $limit=0) { function run_query($query, $match_all=false, $limit=0) {
$ret = array(); $ret = array();
$all=$this->abook->query($query,["FN", "N", "EMAIL", "NICKNAME", "ORG"],$match_all,$limit); $all=$this->abook->query($query,["FN", "N", "EMAIL", "ORG"],$match_all,$limit);
/* /*
Returns an array of matched VCards: Returns an array of matched VCards:
The keys of the array are the URIs of the vcards The keys of the array are the URIs of the vcards