Changed SQL queries for looking up contacts to only query once and sort at the same...

diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index 54c455e515f8688747b6df1677f5120b9ab14069..9d782246a0acec2fbcb657e94493be959a136827 100644 (file)
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -61,6 +61,5 @@ foreach( $add as $propname){
        $vcard->addProperty($propname, $value, $prop_parameters);
 }
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
-OC_Log::write('contacts','ajax/addcard.php - adding id: '.$id,OC_Log::DEBUG);
 
 OC_Contacts_App::renderDetails($id, $vcard);

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 54ad3e4c1030aa41271bb9057172537e5501ac65..cf86764105f1a5bcadb50a0f0bf3f915dd2350a4 100644 (file)
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -12,21 +12,6 @@ OC_JSON::checkAppEnabled('contacts');
 
 $ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
 $contacts = OC_Contacts_VCard::all($ids);
-//OC_Log::write('contacts','contacts.php: '.count($contacts).' contacts.',OC_Log::DEBUG);
-/*
-$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
-$contacts = array();
-foreach( $addressbooks as $addressbook ){
-       $addressbookcontacts = OC_Contacts_VCard::all($addressbook['id']);
-       foreach( $addressbookcontacts as $contact ){
-               if(is_null($contact['fullname'])){
-                       continue;
-               }
-               $contacts[] = $contact;
-       }
-}
-usort($contacts,'contacts_namesort');
-*/
 $tmpl = new OC_TEMPLATE("contacts", "part.contacts");
 $tmpl->assign('contacts', $contacts);
 $page = $tmpl->fetchPage();

diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 5ab6f293ab4527b413f9e2f7d57eece91c95fa2a..b392b195a9cc6793ae54aecbe23b642a1d2e1434 100644 (file)
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -42,23 +42,6 @@ OC_App::setActiveNavigationEntry( 'contacts_index' );
 
 // Load a specific user?
 $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
-/*
-// sort addressbooks  (use contactsort)
-usort($addressbooks,'contacts_namesort');
-
-$contacts = array();
-foreach( $addressbooks as $addressbook ){
-       $addressbookcontacts = OC_Contacts_VCard::all($addressbook['id']);
-       foreach( $addressbookcontacts as $contact ){
-               if(is_null($contact['fullname'])){
-                       continue;
-               }
-               $contacts[] = $contact;
-       }
-}
-
-usort($contacts,'contacts_namesort');
-*/
 $details = array();
 
 // FIXME: This cannot work..?