The local address book is replaced now by the system addressbook as part of the dav app

diff --git a/lib/base.php b/lib/base.php
index 56ff1cb8962d2783b8f8fa8ce8dc0f60bcde4546..fc4a99287d0c962965d112c10a014afe280a444a 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -645,7 +645,6 @@ class OC {
                }
                self::registerShareHooks();
                self::registerLogRotate();
-               self::registerLocalAddressBook();
                self::registerEncryptionWrapper();
                self::registerEncryptionHooks();
 
@@ -701,14 +700,6 @@ class OC {
                \OC::$server->getEventLogger()->end('boot');
        }
 
-       private static function registerLocalAddressBook() {
-               self::$server->getContactsManager()->register(function() {
-                       $userManager = \OC::$server->getUserManager();
-                       \OC::$server->getContactsManager()->registerAddressBook(
-                               new \OC\Contacts\LocalAddressBook($userManager));
-               });
-       }
-
        /**
         * register hooks for the cache
         */

diff --git a/lib/private/contacts/localaddressbook.php b/lib/private/contacts/localaddressbook.php
deleted file mode 100644 (file)
index 6fba63a..0000000
--- a/lib/private/contacts/localaddressbook.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OC\Contacts;
-
-class LocalAddressBook implements \OCP\IAddressBook {
-
-       /**
-        * @var \OCP\IUserManager
-        */
-       private $userManager;
-
-       /**
-        * @param $userManager
-        */
-       public function __construct($userManager) {
-               $this->userManager = $userManager;
-       }
-
-       /**
-        * @return string defining the technical unique key
-        */
-       public function getKey() {
-               return 'local';
-       }
-
-       /**
-        * In comparison to getKey() this function returns a human readable (maybe translated) name
-        *
-        * @return mixed
-        */
-       public function getDisplayName() {
-               return "Local users";
-       }
-
-       /**
-        * @param string $pattern which should match within the $searchProperties
-        * @param array $searchProperties defines the properties within the query pattern should match
-        * @param array $options - for future use. One should always have options!
-        * @return array an array of contacts which are arrays of key-value-pairs
-        */
-       public function search($pattern, $searchProperties, $options) {
-               $users = array();
-               if($pattern == '') {
-                       // Fetch all contacts
-                       $users = $this->userManager->search('');
-               } else {
-                       foreach($searchProperties as $property) {
-                               $result = array();
-                               if($property === 'FN') {
-                                       $result = $this->userManager->searchDisplayName($pattern);
-                               } else if ($property === 'id') {
-                                       $result = $this->userManager->search($pattern);
-                               }
-                               if (is_array($result)) {
-                                       $users = array_merge($users, $result);
-                               }
-                       }
-               }
-
-               $contacts = array();
-               foreach($users as $user){
-                       $contact = array(
-                               "id" => $user->getUID(),
-                               "FN" => $user->getDisplayname(),
-                               "EMAIL" => array(),
-                               "IMPP" => array(
-                                               "x-owncloud-handle:" . $user->getUID()
-                                               )
-                                       );
-                       $contacts[] = $contact;
-               }
-               return $contacts;
-       }
-
-       /**
-        * @param array $properties this array if key-value-pairs defines a contact
-        * @return array an array representing the contact just created or updated
-        */
-       public function createOrUpdate($properties) {
-               return array();
-       }
-
-       /**
-        * @return int
-        */
-       public function getPermissions() {
-               return \OCP\Constants::PERMISSION_READ;
-       }
-
-       /**
-        * @param object $id the unique identifier to a contact
-        * @return bool successful or not
-        */
-       public function delete($id) {
-               return false;
-       }
-}

diff --git a/tests/lib/contacts/localadressbook.php b/tests/lib/contacts/localadressbook.php
deleted file mode 100644 (file)
index ad3c088..0000000
--- a/tests/lib/contacts/localadressbook.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-use OC\Contacts\LocalAddressBook;
-use OCP\IUser;
-
-/**
- * ownCloud
- *
- * @author Thomas Müller
- * @copyright 2014 Thomas Müller thomas.mueller@tmit.eu
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-class Test_LocalAddressBook extends \Test\TestCase
-{
-
-       public function testSearchFN() {
-               $stub = $this->getMockForAbstractClass('\OCP\IUserManager', array('searchDisplayName'));
-
-               $stub->expects($this->any())->method('searchDisplayName')->will($this->returnValue(array(
-                       new SimpleUserForTesting('tom', 'Thomas'),
-                       new SimpleUserForTesting('tomtom', 'Thomas T.'),
-               )));
-
-               $localAddressBook = new LocalAddressBook($stub);
-
-               $result = $localAddressBook->search('tom', array('FN'), array());
-               $this->assertEquals(2, count($result));
-       }
-
-       public function testSearchId() {
-               $stub = $this->getMockForAbstractClass('\OCP\IUserManager', array('searchDisplayName'));
-
-               $stub->expects($this->any())->method('search')->will($this->returnValue(array(
-                       new SimpleUserForTesting('tom', 'Thomas'),
-                       new SimpleUserForTesting('tomtom', 'Thomas T.'),
-               )));
-
-               $localAddressBook = new LocalAddressBook($stub);
-
-               $result = $localAddressBook->search('tom', array('id'), array());
-               $this->assertEquals(2, count($result));
-       }
-}
-
-
-class SimpleUserForTesting implements IUser {
-
-       private $uid;
-       private $displayName;
-
-       public function __construct($uid, $displayName) {
-
-               $this->uid = $uid;
-               $this->displayName = $displayName;
-       }
-
-       public function getUID() {
-               return $this->uid;
-       }
-
-       public function getDisplayName() {
-               return $this->displayName;
-       }
-
-       public function setDisplayName($displayName) {
-       }
-
-       public function getLastLogin() {
-       }
-
-       public function updateLastLoginTimestamp() {
-       }
-
-       public function delete() {
-       }
-
-       public function setPassword($password, $recoveryPassword = null) {
-       }
-
-       public function getHome() {
-       }
-
-       public function getBackendClassName() {
-       }
-
-       public function canChangeAvatar() {
-       }
-
-       public function canChangePassword() {
-       }
-
-       public function canChangeDisplayName() {
-       }
-
-       public function isEnabled() {
-       }
-
-       public function setEnabled($enabled) {
-       }
-
-       public function getEMailAddress() {
-       }
-
-       public function getAvatarImage($size) {
-       }
-
-       public function getCloudId() {
-       }
-
-       public function setEMailAddress($mailAddress) {
-       }
-}