From d1cf787197c4a5209881f61c60a9172d7b41a684 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 9 Jul 2012 00:15:37 +0200 Subject: [PATCH] Move code to OC_Contacts_App::scanCategories(). --- apps/contacts/ajax/categories/rescan.php | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php index 679f57aa26a..0d8464a23ed 100644 --- a/apps/contacts/ajax/categories/rescan.php +++ b/apps/contacts/ajax/categories/rescan.php @@ -10,22 +10,7 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('contacts'); -require_once(__DIR__.'/../loghandler.php'); - -$addressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser()); -if(count($addressbooks) == 0) { - bailOut(OC_Contacts_App::$l10n->t('No address books found.')); -} -$addressbookids = array(); -foreach($addressbooks as $addressbook) { - $addressbookids[] = $addressbook['id']; -} -$contacts = OC_Contacts_VCard::all($addressbookids); -if(count($contacts) == 0) { - bailOut(OC_Contacts_App::$l10n->t('No contacts found.')); -} - -OC_Contacts_App::scanCategories($contacts); +OC_Contacts_App::scanCategories(); $categories = OC_Contacts_App::getCategories(); OCP\JSON::success(array('data' => array('categories'=>$categories))); -- 2.39.5