rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity

Add check for return value.

Browse Source
This commit is contained in:
Thomas Tanghus 2012-06-27 02:10:02 +02:00
parent 1d5c4c2529
commit 074406a7f0
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ajax/contacts.php
View File

@ -31,19 +31,21 @@ foreach($active_addressbooks as $addressbook) {
$contacts_alphabet = OC_Contacts_VCard::all($ids); $contacts_alphabet = OC_Contacts_VCard::all($ids);
// Our new array for the contacts sorted by addressbook // Our new array for the contacts sorted by addressbook
foreach($contacts_alphabet as $contact) { if($contacts_alphabet) {
if(!isset($contacts_addressbook[$contact['addressbookid']])) { // It should never execute. foreach($contacts_alphabet as $contact) {
$contacts_addressbook[$contact['addressbookid']] = array('contacts' => array()); if(!isset($contacts_addressbook[$contact['addressbookid']])) { // It should never execute.
} $contacts_addressbook[$contact['addressbookid']] = array('contacts' => array());
$display = trim($contact['fullname']);
if(!$display) {
$vcard = OC_Contacts_App::getContactVCard($contact['id']);
if(!is_null($vcard)) {
$struct = OC_Contacts_VCard::structureContact($vcard);
$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
} }
$display = trim($contact['fullname']);
if(!$display) {
$vcard = OC_Contacts_App::getContactVCard($contact['id']);
if(!is_null($vcard)) {
$struct = OC_Contacts_VCard::structureContact($vcard);
$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
}
}
$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
} }
$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
} }
unset($contacts_alphabet); unset($contacts_alphabet);
uasort($contacts_addressbook, 'cmp'); uasort($contacts_addressbook, 'cmp');