diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-07-09 19:09:46 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-07-10 01:24:40 +0200 |
| commit | 7cb74a0bf34494d93a3139992668eaa112a6b825 (patch) | |
| tree | 7a857728447001e90123dcb86294b9c16a6e575d /apps/contacts | |
| parent | 50462903d6dd86f867947cbc1cdb5b65f72592ab (diff) | |
| download | nextcloud-server-7cb74a0bf34494d93a3139992668eaa112a6b825.tar.gz nextcloud-server-7cb74a0bf34494d93a3139992668eaa112a6b825.zip | |
Reduce variables assigned.
Diffstat (limited to 'apps/contacts')
| -rw-r--r-- | apps/contacts/index.php | 19 | ||||
| -rw-r--r-- | apps/contacts/templates/index.php | 2 |
2 files changed, 5 insertions, 16 deletions
diff --git a/apps/contacts/index.php b/apps/contacts/index.php index a89ffffa9ca..70d594e71bc 100644 --- a/apps/contacts/index.php +++ b/apps/contacts/index.php @@ -14,28 +14,18 @@ OCP\App::checkAppEnabled('contacts'); // Get active address books. This creates a default one if none exists. $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser()); -$contacts = OC_Contacts_VCard::all($ids); +$has_contacts = (count(OC_Contacts_VCard::all($ids, 0, 1)) > 0 ? true : false); // just to check if there are any contacts. if($contacts === false) { OCP\Util::writeLog('contacts','index.html: No contacts found.',OCP\Util::DEBUG); } - -$addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser()); +error_log('activeIds: '.print_r($activeIds, true)); +error_log('has_contacts: '.$has_contacts); // Load the files we need OCP\App::setActiveNavigationEntry( 'contacts_index' ); // Load a specific user? $id = isset( $_GET['id'] ) ? $_GET['id'] : null; -$details = array(); - -if(is_null($id) && count($contacts) > 0) { - $id = $contacts[0]['id']; -} -unset($contacts); -if(!is_null($id)) { - $vcard = OC_Contacts_App::getContactVCard($id); - $details = OC_Contacts_VCard::structureContact($vcard); -} $property_types = OC_Contacts_App::getAddPropertyOptions(); $phone_types = OC_Contacts_App::getTypesOfProperty('TEL'); $email_types = OC_Contacts_App::getTypesOfProperty('EMAIL'); @@ -69,7 +59,6 @@ $tmpl->assign('property_types', $property_types); $tmpl->assign('phone_types', $phone_types); $tmpl->assign('email_types', $email_types); $tmpl->assign('categories', $categories); -$tmpl->assign('addressbooks', $addressbooks); -$tmpl->assign('details', $details ); +$tmpl->assign('has_contacts',$has_contacts); $tmpl->assign('id',$id); $tmpl->printPage(); diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php index a8fb6c57c2c..5b49b68e954 100644 --- a/apps/contacts/templates/index.php +++ b/apps/contacts/templates/index.php @@ -16,7 +16,7 @@ </div> <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>"> <?php - if ($_['id']){ + if($_['has_contacts']){ echo $this->inc('part.contact'); } else{ |