nextcloud / server

lib/private/Files/Cache/FailedCache.php

Indentation +115 added lines, -115 removed lines

@@ -30,119 +30,119 @@
  * Storage placeholder to represent a missing precondition, storage unavailable
  */
 class FailedCache implements ICache {
-	/** @var bool whether to show the failed storage in the ui */
-	private $visible;
-
-	/**
-	 * FailedCache constructor.
-	 *
-	 * @param bool $visible
-	 */
-	public function __construct($visible = true) {
-		$this->visible = $visible;
-	}
-
-
-	public function getNumericStorageId() {
-		return -1;
-	}
-
-	public function get($file) {
-		if ($file === '') {
-			return new CacheEntry([
-				'fileid' => -1,
-				'size' => 0,
-				'mimetype' => 'httpd/unix-directory',
-				'mimepart' => 'httpd',
-				'permissions' => $this->visible ? Constants::PERMISSION_READ : 0,
-				'mtime' => time()
-			]);
-		} else {
-			return false;
-		}
-	}
-
-	public function getFolderContents($folder) {
-		return [];
-	}
-
-	public function getFolderContentsById($fileId) {
-		return [];
-	}
-
-	public function put($file, array $data) {
-		return;
-	}
-
-	public function insert($file, array $data) {
-		return;
-	}
-
-	public function update($id, array $data) {
-		return;
-	}
-
-	public function getId($file) {
-		return -1;
-	}
-
-	public function getParentId($file) {
-		return -1;
-	}
-
-	public function inCache($file) {
-		return false;
-	}
-
-	public function remove($file) {
-		return;
-	}
-
-	public function move($source, $target) {
-		return;
-	}
-
-	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
-		return;
-	}
-
-	public function clear() {
-		return;
-	}
-
-	public function getStatus($file) {
-		return ICache::NOT_FOUND;
-	}
-
-	public function search($pattern) {
-		return [];
-	}
-
-	public function searchByMime($mimetype) {
-		return [];
-	}
-
-	public function searchByTag($tag, $userId) {
-		return [];
-	}
-
-	public function searchQuery(ISearchQuery $query) {
-		return [];
-	}
-
-	public function getAll() {
-		return [];
-	}
-
-	public function getIncomplete() {
-		return [];
-	}
-
-	public function getPathById($id) {
-		return null;
-	}
-
-	public function normalize($path) {
-		return $path;
-	}
+    /** @var bool whether to show the failed storage in the ui */
+    private $visible;
+
+    /**
+     * FailedCache constructor.
+     *
+     * @param bool $visible
+     */
+    public function __construct($visible = true) {
+        $this->visible = $visible;
+    }
+
+
+    public function getNumericStorageId() {
+        return -1;
+    }
+
+    public function get($file) {
+        if ($file === '') {
+            return new CacheEntry([
+                'fileid' => -1,
+                'size' => 0,
+                'mimetype' => 'httpd/unix-directory',
+                'mimepart' => 'httpd',
+                'permissions' => $this->visible ? Constants::PERMISSION_READ : 0,
+                'mtime' => time()
+            ]);
+        } else {
+            return false;
+        }
+    }
+
+    public function getFolderContents($folder) {
+        return [];
+    }
+
+    public function getFolderContentsById($fileId) {
+        return [];
+    }
+
+    public function put($file, array $data) {
+        return;
+    }
+
+    public function insert($file, array $data) {
+        return;
+    }
+
+    public function update($id, array $data) {
+        return;
+    }
+
+    public function getId($file) {
+        return -1;
+    }
+
+    public function getParentId($file) {
+        return -1;
+    }
+
+    public function inCache($file) {
+        return false;
+    }
+
+    public function remove($file) {
+        return;
+    }
+
+    public function move($source, $target) {
+        return;
+    }
+
+    public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
+        return;
+    }
+
+    public function clear() {
+        return;
+    }
+
+    public function getStatus($file) {
+        return ICache::NOT_FOUND;
+    }
+
+    public function search($pattern) {
+        return [];
+    }
+
+    public function searchByMime($mimetype) {
+        return [];
+    }
+
+    public function searchByTag($tag, $userId) {
+        return [];
+    }
+
+    public function searchQuery(ISearchQuery $query) {
+        return [];
+    }
+
+    public function getAll() {
+        return [];
+    }
+
+    public function getIncomplete() {
+        return [];
+    }
+
+    public function getPathById($id) {
+        return null;
+    }
+
+    public function normalize($path) {
+        return $path;
+    }
 }

lib/private/Lockdown/Filesystem/NullCache.php

Indentation +96 added lines, -96 removed lines

@@ -27,101 +27,101 @@
 use OCP\Files\Search\ISearchQuery;
 
 class NullCache implements ICache {
-	public function getNumericStorageId() {
-		return -1;
-	}
-
-	public function get($file) {
-		return $file !== '' ? null :
-			new CacheEntry([
-				'fileid' => -1,
-				'parent' => -1,
-				'name' => '',
-				'path' => '',
-				'size' => '0',
-				'mtime' => time(),
-				'storage_mtime' => time(),
-				'etag' => '',
-				'mimetype' => FileInfo::MIMETYPE_FOLDER,
-				'mimepart' => 'httpd',
-				'permissions' => Constants::PERMISSION_READ
-			]);
-	}
-
-	public function getFolderContents($folder) {
-		return [];
-	}
-
-	public function getFolderContentsById($fileId) {
-		return [];
-	}
-
-	public function put($file, array $data) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
-
-	public function insert($file, array $data) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
-
-	public function update($id, array $data) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
-
-	public function getId($file) {
-		return -1;
-	}
-
-	public function getParentId($file) {
-		return -1;
-	}
-
-	public function inCache($file) {
-		return $file === '';
-	}
-
-	public function remove($file) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
-
-	public function move($source, $target) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
-
-	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
-
-	public function getStatus($file) {
-		return ICache::COMPLETE;
-	}
-
-	public function search($pattern) {
-		return [];
-	}
-
-	public function searchByMime($mimetype) {
-		return [];
-	}
-
-	public function searchQuery(ISearchQuery $query) {
-		return [];
-	}
-
-	public function searchByTag($tag, $userId) {
-		return [];
-	}
-
-	public function getIncomplete() {
-		return [];
-	}
-
-	public function getPathById($id) {
-		return '';
-	}
-
-	public function normalize($path) {
-		return $path;
-	}
+    public function getNumericStorageId() {
+        return -1;
+    }
+
+    public function get($file) {
+        return $file !== '' ? null :
+            new CacheEntry([
+                'fileid' => -1,
+                'parent' => -1,
+                'name' => '',
+                'path' => '',
+                'size' => '0',
+                'mtime' => time(),
+                'storage_mtime' => time(),
+                'etag' => '',
+                'mimetype' => FileInfo::MIMETYPE_FOLDER,
+                'mimepart' => 'httpd',
+                'permissions' => Constants::PERMISSION_READ
+            ]);
+    }
+
+    public function getFolderContents($folder) {
+        return [];
+    }
+
+    public function getFolderContentsById($fileId) {
+        return [];
+    }
+
+    public function put($file, array $data) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
+
+    public function insert($file, array $data) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
+
+    public function update($id, array $data) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
+
+    public function getId($file) {
+        return -1;
+    }
+
+    public function getParentId($file) {
+        return -1;
+    }
+
+    public function inCache($file) {
+        return $file === '';
+    }
+
+    public function remove($file) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
+
+    public function move($source, $target) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
+
+    public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
+
+    public function getStatus($file) {
+        return ICache::COMPLETE;
+    }
+
+    public function search($pattern) {
+        return [];
+    }
+
+    public function searchByMime($mimetype) {
+        return [];
+    }
+
+    public function searchQuery(ISearchQuery $query) {
+        return [];
+    }
+
+    public function searchByTag($tag, $userId) {
+        return [];
+    }
+
+    public function getIncomplete() {
+        return [];
+    }
+
+    public function getPathById($id) {
+        return '';
+    }
+
+    public function normalize($path) {
+        return $path;
+    }
 
 }

apps/user_ldap/templates/renewpassword.php

Indentation +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php /** @var $l OC_L10N */ ?>
 <?php
 script('core', [
-	'jquery-showpassword',
+    'jquery-showpassword',
 ]);
 script('user_ldap', [
-	'renewPassword',
+    'renewPassword',
 ]);
 style('user_ldap', 'renewPassword');
 \OC_Util::addVendorScript('strengthify/jquery.strengthify');

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
 		<div class="warning title">
 			<?php p($l->t('Please renew your password.')); ?><br>
 		</div>
-		<?php foreach($_['messages'] as $message): ?>
+		<?php foreach ($_['messages'] as $message): ?>
 			<div class="warning">
 				<?php p($message); ?><br>
 			</div>
@@ -31,14 +31,14 @@ 
 		<?php endif; ?>
 		<div id="message" class="hidden">
 			<img class="float-spinner" alt=""
-				src="<?php p(image_path('core', 'loading-dark.gif'));?>">
+				src="<?php p(image_path('core', 'loading-dark.gif')); ?>">
 			<span id="messageText"></span>
 			<!-- the following div ensures that the spinner is always inside the #message div -->
 			<div style="clear: both;"></div>
 		</div>
 		<p class="grouptop">
 			<input type="password" id="oldPassword" name="oldPassword"
-				placeholder="<?php echo $l->t('Current password');?>"
+				placeholder="<?php echo $l->t('Current password'); ?>"
 				autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/>
 			<label for="oldPassword" class="infield"><?php p($l->t('Current password')); ?></label>
 		</p>
@@ -47,7 +47,7 @@ 
 			<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
 			<label id="newPassword-label" for="newPassword" class="infield"><?php p($l->t('New password')); ?></label>
 			<input type="password" id="newPassword" name="newPassword"
-				placeholder="<?php echo $l->t('New password');?>"
+				placeholder="<?php echo $l->t('New password'); ?>"
 				data-typetoggle="#personal-show" autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/>
 		</p>
 		

apps/user_ldap/lib/Jobs/CleanUp.php

Spacing +14 added lines, -15 removed lines

@@ -80,22 +80,22 @@ 
 		//pass in app.php we do add here, except something else is passed e.g.
 		//in tests.
 
-		if(isset($arguments['helper'])) {
+		if (isset($arguments['helper'])) {
 			$this->ldapHelper = $arguments['helper'];
 		} else {
 			$this->ldapHelper = new Helper(\OC::$server->getConfig());
 		}
 
-		if(isset($arguments['ocConfig'])) {
+		if (isset($arguments['ocConfig'])) {
 			$this->ocConfig = $arguments['ocConfig'];
 		} else {
 			$this->ocConfig = \OC::$server->getConfig();
 		}
 
-		if(isset($arguments['userBackend'])) {
+		if (isset($arguments['userBackend'])) {
 			$this->userBackend = $arguments['userBackend'];
 		} else {
-			$this->userBackend =  new User_Proxy(
+			$this->userBackend = new User_Proxy(
 				$this->ldapHelper->getServerConfigurationPrefixes(true),
 				new LDAP(),
 				$this->ocConfig,
@@ -103,19 +103,19 @@ 
 			);
 		}
 
-		if(isset($arguments['db'])) {
+		if (isset($arguments['db'])) {
 			$this->db = $arguments['db'];
 		} else {
 			$this->db = \OC::$server->getDatabaseConnection();
 		}
 
-		if(isset($arguments['mapping'])) {
+		if (isset($arguments['mapping'])) {
 			$this->mapping = $arguments['mapping'];
 		} else {
 			$this->mapping = new UserMapping($this->db);
 		}
 
-		if(isset($arguments['deletedUsersIndex'])) {
+		if (isset($arguments['deletedUsersIndex'])) {
 			$this->dui = $arguments['deletedUsersIndex'];
 		} else {
 			$this->dui = new DeletedUsersIndex(
@@ -130,11 +130,11 @@ 
 	public function run($argument) {
 		$this->setArguments($argument);
 
-		if(!$this->isCleanUpAllowed()) {
+		if (!$this->isCleanUpAllowed()) {
 			return;
 		}
 		$users = $this->mapping->getList($this->getOffset(), $this->limit);
-		if(!is_array($users)) {
+		if (!is_array($users)) {
 			//something wrong? Let's start from the beginning next time and
 			//abort
 			$this->setOffset(true);
@@ -160,7 +160,7 @@ 
 	 */
 	public function isCleanUpAllowed() {
 		try {
-			if($this->ldapHelper->haveDisabledConfigurations()) {
+			if ($this->ldapHelper->haveDisabledConfigurations()) {
 				return false;
 			}
 		} catch (\Exception $e) {
@@ -177,7 +177,7 @@ 
 	 * @return bool
 	 */
 	private function isCleanUpEnabled() {
-		return (bool)$this->ocConfig->getSystemValue(
+		return (bool) $this->ocConfig->getSystemValue(
 			'ldapUserCleanupInterval', strval($this->defaultIntervalMin));
 	}
 
@@ -186,7 +186,7 @@ 
 	 * @param array $users result from getMappedUsers()
 	 */
 	private function checkUsers(array $users) {
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			$this->checkUser($user);
 		}
 	}
@@ -196,7 +196,7 @@ 
 	 * @param string[] $user
 	 */
 	private function checkUser(array $user) {
-		if($this->userBackend->userExistsOnLDAP($user['name'])) {
+		if ($this->userBackend->userExistsOnLDAP($user['name'])) {
 			//still available, all good
 
 			return;
@@ -218,8 +218,7 @@ 
 	 * @param bool $reset whether the offset should be set to 0
 	 */
 	public function setOffset($reset = false) {
-		$newOffset = $reset ? 0 :
-			$this->getOffset() + $this->limit;
+		$newOffset = $reset ? 0 : $this->getOffset() + $this->limit;
 		$this->ocConfig->setAppValue('user_ldap', 'cleanUpJobOffset', $newOffset);
 	}
 

Indentation +192 added lines, -192 removed lines

@@ -40,197 +40,197 @@
  * @package OCA\User_LDAP\Jobs;
  */
 class CleanUp extends TimedJob {
-	/** @var int $limit amount of users that should be checked per run */
-	protected $limit = 50;
-
-	/** @var int $defaultIntervalMin default interval in minutes */
-	protected $defaultIntervalMin = 51;
-
-	/** @var User_LDAP|User_Proxy $userBackend */
-	protected $userBackend;
-
-	/** @var \OCP\IConfig $ocConfig */
-	protected $ocConfig;
-
-	/** @var \OCP\IDBConnection $db */
-	protected $db;
-
-	/** @var Helper $ldapHelper */
-	protected $ldapHelper;
-
-	/** @var \OCA\User_LDAP\Mapping\UserMapping */
-	protected $mapping;
-
-	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
-	protected $dui;
-
-	public function __construct() {
-		$minutes = \OC::$server->getConfig()->getSystemValue(
-			'ldapUserCleanupInterval', strval($this->defaultIntervalMin));
-		$this->setInterval(intval($minutes) * 60);
-	}
-
-	/**
-	 * assigns the instances passed to run() to the class properties
-	 * @param array $arguments
-	 */
-	public function setArguments($arguments) {
-		//Dependency Injection is not possible, because the constructor will
-		//only get values that are serialized to JSON. I.e. whatever we would
-		//pass in app.php we do add here, except something else is passed e.g.
-		//in tests.
-
-		if(isset($arguments['helper'])) {
-			$this->ldapHelper = $arguments['helper'];
-		} else {
-			$this->ldapHelper = new Helper(\OC::$server->getConfig());
-		}
-
-		if(isset($arguments['ocConfig'])) {
-			$this->ocConfig = $arguments['ocConfig'];
-		} else {
-			$this->ocConfig = \OC::$server->getConfig();
-		}
-
-		if(isset($arguments['userBackend'])) {
-			$this->userBackend = $arguments['userBackend'];
-		} else {
-			$this->userBackend =  new User_Proxy(
-				$this->ldapHelper->getServerConfigurationPrefixes(true),
-				new LDAP(),
-				$this->ocConfig,
-				\OC::$server->getNotificationManager(),
-				\OC::$server->getUserSession(),
-				\OC::$server->query('LDAPUserPluginManager')
-			);
-		}
-
-		if(isset($arguments['db'])) {
-			$this->db = $arguments['db'];
-		} else {
-			$this->db = \OC::$server->getDatabaseConnection();
-		}
-
-		if(isset($arguments['mapping'])) {
-			$this->mapping = $arguments['mapping'];
-		} else {
-			$this->mapping = new UserMapping($this->db);
-		}
-
-		if(isset($arguments['deletedUsersIndex'])) {
-			$this->dui = $arguments['deletedUsersIndex'];
-		} else {
-			$this->dui = new DeletedUsersIndex(
-				$this->ocConfig, $this->db, $this->mapping);
-		}
-	}
-
-	/**
-	 * makes the background job do its work
-	 * @param array $argument
-	 */
-	public function run($argument) {
-		$this->setArguments($argument);
-
-		if(!$this->isCleanUpAllowed()) {
-			return;
-		}
-		$users = $this->mapping->getList($this->getOffset(), $this->limit);
-		if(!is_array($users)) {
-			//something wrong? Let's start from the beginning next time and
-			//abort
-			$this->setOffset(true);
-			return;
-		}
-		$resetOffset = $this->isOffsetResetNecessary(count($users));
-		$this->checkUsers($users);
-		$this->setOffset($resetOffset);
-	}
-
-	/**
-	 * checks whether next run should start at 0 again
-	 * @param int $resultCount
-	 * @return bool
-	 */
-	public function isOffsetResetNecessary($resultCount) {
-		return ($resultCount < $this->limit) ? true : false;
-	}
-
-	/**
-	 * checks whether cleaning up LDAP users is allowed
-	 * @return bool
-	 */
-	public function isCleanUpAllowed() {
-		try {
-			if($this->ldapHelper->haveDisabledConfigurations()) {
-				return false;
-			}
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		$enabled = $this->isCleanUpEnabled();
-
-		return $enabled;
-	}
-
-	/**
-	 * checks whether clean up is enabled by configuration
-	 * @return bool
-	 */
-	private function isCleanUpEnabled() {
-		return (bool)$this->ocConfig->getSystemValue(
-			'ldapUserCleanupInterval', strval($this->defaultIntervalMin));
-	}
-
-	/**
-	 * checks users whether they are still existing
-	 * @param array $users result from getMappedUsers()
-	 */
-	private function checkUsers(array $users) {
-		foreach($users as $user) {
-			$this->checkUser($user);
-		}
-	}
-
-	/**
-	 * checks whether a user is still existing in LDAP
-	 * @param string[] $user
-	 */
-	private function checkUser(array $user) {
-		if($this->userBackend->userExistsOnLDAP($user['name'])) {
-			//still available, all good
-
-			return;
-		}
-
-		$this->dui->markUser($user['name']);
-	}
-
-	/**
-	 * gets the offset to fetch users from the mappings table
-	 * @return int
-	 */
-	private function getOffset() {
-		return intval($this->ocConfig->getAppValue('user_ldap', 'cleanUpJobOffset', 0));
-	}
-
-	/**
-	 * sets the new offset for the next run
-	 * @param bool $reset whether the offset should be set to 0
-	 */
-	public function setOffset($reset = false) {
-		$newOffset = $reset ? 0 :
-			$this->getOffset() + $this->limit;
-		$this->ocConfig->setAppValue('user_ldap', 'cleanUpJobOffset', $newOffset);
-	}
-
-	/**
-	 * returns the chunk size (limit in DB speak)
-	 * @return int
-	 */
-	public function getChunkSize() {
-		return $this->limit;
-	}
+    /** @var int $limit amount of users that should be checked per run */
+    protected $limit = 50;
+
+    /** @var int $defaultIntervalMin default interval in minutes */
+    protected $defaultIntervalMin = 51;
+
+    /** @var User_LDAP|User_Proxy $userBackend */
+    protected $userBackend;
+
+    /** @var \OCP\IConfig $ocConfig */
+    protected $ocConfig;
+
+    /** @var \OCP\IDBConnection $db */
+    protected $db;
+
+    /** @var Helper $ldapHelper */
+    protected $ldapHelper;
+
+    /** @var \OCA\User_LDAP\Mapping\UserMapping */
+    protected $mapping;
+
+    /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
+    protected $dui;
+
+    public function __construct() {
+        $minutes = \OC::$server->getConfig()->getSystemValue(
+            'ldapUserCleanupInterval', strval($this->defaultIntervalMin));
+        $this->setInterval(intval($minutes) * 60);
+    }
+
+    /**
+     * assigns the instances passed to run() to the class properties
+     * @param array $arguments
+     */
+    public function setArguments($arguments) {
+        //Dependency Injection is not possible, because the constructor will
+        //only get values that are serialized to JSON. I.e. whatever we would
+        //pass in app.php we do add here, except something else is passed e.g.
+        //in tests.
+
+        if(isset($arguments['helper'])) {
+            $this->ldapHelper = $arguments['helper'];
+        } else {
+            $this->ldapHelper = new Helper(\OC::$server->getConfig());
+        }
+
+        if(isset($arguments['ocConfig'])) {
+            $this->ocConfig = $arguments['ocConfig'];
+        } else {
+            $this->ocConfig = \OC::$server->getConfig();
+        }
+
+        if(isset($arguments['userBackend'])) {
+            $this->userBackend = $arguments['userBackend'];
+        } else {
+            $this->userBackend =  new User_Proxy(
+                $this->ldapHelper->getServerConfigurationPrefixes(true),
+                new LDAP(),
+                $this->ocConfig,
+                \OC::$server->getNotificationManager(),
+                \OC::$server->getUserSession(),
+                \OC::$server->query('LDAPUserPluginManager')
+            );
+        }
+
+        if(isset($arguments['db'])) {
+            $this->db = $arguments['db'];
+        } else {
+            $this->db = \OC::$server->getDatabaseConnection();
+        }
+
+        if(isset($arguments['mapping'])) {
+            $this->mapping = $arguments['mapping'];
+        } else {
+            $this->mapping = new UserMapping($this->db);
+        }
+
+        if(isset($arguments['deletedUsersIndex'])) {
+            $this->dui = $arguments['deletedUsersIndex'];
+        } else {
+            $this->dui = new DeletedUsersIndex(
+                $this->ocConfig, $this->db, $this->mapping);
+        }
+    }
+
+    /**
+     * makes the background job do its work
+     * @param array $argument
+     */
+    public function run($argument) {
+        $this->setArguments($argument);
+
+        if(!$this->isCleanUpAllowed()) {
+            return;
+        }
+        $users = $this->mapping->getList($this->getOffset(), $this->limit);
+        if(!is_array($users)) {
+            //something wrong? Let's start from the beginning next time and
+            //abort
+            $this->setOffset(true);
+            return;
+        }
+        $resetOffset = $this->isOffsetResetNecessary(count($users));
+        $this->checkUsers($users);
+        $this->setOffset($resetOffset);
+    }
+
+    /**
+     * checks whether next run should start at 0 again
+     * @param int $resultCount
+     * @return bool
+     */
+    public function isOffsetResetNecessary($resultCount) {
+        return ($resultCount < $this->limit) ? true : false;
+    }
+
+    /**
+     * checks whether cleaning up LDAP users is allowed
+     * @return bool
+     */
+    public function isCleanUpAllowed() {
+        try {
+            if($this->ldapHelper->haveDisabledConfigurations()) {
+                return false;
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        $enabled = $this->isCleanUpEnabled();
+
+        return $enabled;
+    }
+
+    /**
+     * checks whether clean up is enabled by configuration
+     * @return bool
+     */
+    private function isCleanUpEnabled() {
+        return (bool)$this->ocConfig->getSystemValue(
+            'ldapUserCleanupInterval', strval($this->defaultIntervalMin));
+    }
+
+    /**
+     * checks users whether they are still existing
+     * @param array $users result from getMappedUsers()
+     */
+    private function checkUsers(array $users) {
+        foreach($users as $user) {
+            $this->checkUser($user);
+        }
+    }
+
+    /**
+     * checks whether a user is still existing in LDAP
+     * @param string[] $user
+     */
+    private function checkUser(array $user) {
+        if($this->userBackend->userExistsOnLDAP($user['name'])) {
+            //still available, all good
+
+            return;
+        }
+
+        $this->dui->markUser($user['name']);
+    }
+
+    /**
+     * gets the offset to fetch users from the mappings table
+     * @return int
+     */
+    private function getOffset() {
+        return intval($this->ocConfig->getAppValue('user_ldap', 'cleanUpJobOffset', 0));
+    }
+
+    /**
+     * sets the new offset for the next run
+     * @param bool $reset whether the offset should be set to 0
+     */
+    public function setOffset($reset = false) {
+        $newOffset = $reset ? 0 :
+            $this->getOffset() + $this->limit;
+        $this->ocConfig->setAppValue('user_ldap', 'cleanUpJobOffset', $newOffset);
+    }
+
+    /**
+     * returns the chunk size (limit in DB speak)
+     * @return int
+     */
+    public function getChunkSize() {
+        return $this->limit;
+    }
 
 }

apps/user_ldap/lib/AppInfo/Application.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct () {
+	public function __construct() {
 		parent::__construct('user_ldap');
 		$container = $this->getContainer();
 

Indentation +20 added lines, -20 removed lines

@@ -28,26 +28,26 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct () {
-		parent::__construct('user_ldap');
-		$container = $this->getContainer();
+    public function __construct () {
+        parent::__construct('user_ldap');
+        $container = $this->getContainer();
 
-		/**
-		 * Controller
-		 */
-		$container->registerService('RenewPasswordController', function(IAppContainer $c) {
-			/** @var \OC\Server $server */
-			$server = $c->query('ServerContainer');
+        /**
+         * Controller
+         */
+        $container->registerService('RenewPasswordController', function(IAppContainer $c) {
+            /** @var \OC\Server $server */
+            $server = $c->query('ServerContainer');
 
-			return new RenewPasswordController(
-				$c->getAppName(),
-				$server->getRequest(),
-				$c->query('UserManager'),
-				$server->getConfig(),
-				$c->query('OCP\IL10N'),
-				$c->query('Session'),
-				$server->getURLGenerator()
-			);
-		});
-	}
+            return new RenewPasswordController(
+                $c->getAppName(),
+                $server->getRequest(),
+                $c->query('UserManager'),
+                $server->getConfig(),
+                $c->query('OCP\IL10N'),
+                $c->query('Session'),
+                $server->getURLGenerator()
+            );
+        });
+    }
 }

apps/theming/lib/ImageManager.php

Indentation +73 added lines, -73 removed lines

@@ -31,82 +31,82 @@
 
 class ImageManager {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IAppData */
-	private $appData;
+    /** @var IConfig */
+    private $config;
+    /** @var IAppData */
+    private $appData;
 
-	/**
-	 * ImageManager constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IAppData $appData
-	 */
-	public function __construct(IConfig $config,
-								IAppData $appData
-	) {
-		$this->config = $config;
-		$this->appData = $appData;
-	}
+    /**
+     * ImageManager constructor.
+     *
+     * @param IConfig $config
+     * @param IAppData $appData
+     */
+    public function __construct(IConfig $config,
+                                IAppData $appData
+    ) {
+        $this->config = $config;
+        $this->appData = $appData;
+    }
 
-	/**
-	 * Get folder for current theming files
-	 *
-	 * @return \OCP\Files\SimpleFS\ISimpleFolder
-	 * @throws NotPermittedException
-	 * @throws \RuntimeException
-	 */
-	public function getCacheFolder() {
-		$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
-		try {
-			$folder = $this->appData->getFolder($cacheBusterValue);
-		} catch (NotFoundException $e) {
-			$folder = $this->appData->newFolder($cacheBusterValue);
-			$this->cleanup();
-		}
-		return $folder;
-	}
+    /**
+     * Get folder for current theming files
+     *
+     * @return \OCP\Files\SimpleFS\ISimpleFolder
+     * @throws NotPermittedException
+     * @throws \RuntimeException
+     */
+    public function getCacheFolder() {
+        $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
+        try {
+            $folder = $this->appData->getFolder($cacheBusterValue);
+        } catch (NotFoundException $e) {
+            $folder = $this->appData->newFolder($cacheBusterValue);
+            $this->cleanup();
+        }
+        return $folder;
+    }
 
-	/**
-	 * Get a file from AppData
-	 *
-	 * @param string $filename
-	 * @throws NotFoundException
-	 * @return \OCP\Files\SimpleFS\ISimpleFile
-	 */
-	public function getCachedImage($filename) {
-		$currentFolder = $this->getCacheFolder();
-		return $currentFolder->getFile($filename);
-	}
+    /**
+     * Get a file from AppData
+     *
+     * @param string $filename
+     * @throws NotFoundException
+     * @return \OCP\Files\SimpleFS\ISimpleFile
+     */
+    public function getCachedImage($filename) {
+        $currentFolder = $this->getCacheFolder();
+        return $currentFolder->getFile($filename);
+    }
 
-	/**
-	 * Store a file for theming in AppData
-	 *
-	 * @param string $filename
-	 * @param string $data
-	 * @return \OCP\Files\SimpleFS\ISimpleFile
-	 */
-	public function setCachedImage($filename, $data) {
-		$currentFolder = $this->getCacheFolder();
-		if ($currentFolder->fileExists($filename)) {
-			$file = $currentFolder->getFile($filename);
-		} else {
-			$file = $currentFolder->newFile($filename);
-		}
-		$file->putContent($data);
-		return $file;
-	}
+    /**
+     * Store a file for theming in AppData
+     *
+     * @param string $filename
+     * @param string $data
+     * @return \OCP\Files\SimpleFS\ISimpleFile
+     */
+    public function setCachedImage($filename, $data) {
+        $currentFolder = $this->getCacheFolder();
+        if ($currentFolder->fileExists($filename)) {
+            $file = $currentFolder->getFile($filename);
+        } else {
+            $file = $currentFolder->newFile($filename);
+        }
+        $file->putContent($data);
+        return $file;
+    }
 
-	/**
-	 * remove cached files that are not required any longer
-	 */
-	public function cleanup() {
-		$currentFolder = $this->getCacheFolder();
-		$folders = $this->appData->getDirectoryListing();
-		foreach ($folders as $folder) {
-			if ($folder->getName() !== 'images' && $folder->getName() !== $currentFolder->getName()) {
-				$folder->delete();
-			}
-		}
-	}
+    /**
+     * remove cached files that are not required any longer
+     */
+    public function cleanup() {
+        $currentFolder = $this->getCacheFolder();
+        $folders = $this->appData->getDirectoryListing();
+        foreach ($folders as $folder) {
+            if ($folder->getName() !== 'images' && $folder->getName() !== $currentFolder->getName()) {
+                $folder->delete();
+            }
+        }
+    }
 }

apps/theming/lib/Migration/ThemingImages.php

Indentation +34 added lines, -34 removed lines

@@ -34,44 +34,44 @@
 
 class ThemingImages implements IRepairStep {
 
-	private $appData;
-	private $rootFolder;
+    private $appData;
+    private $rootFolder;
 
-	public function __construct(IAppData $appData, IRootFolder $rootFolder) {
-		$this->appData = $appData;
-		$this->rootFolder = $rootFolder;
-	}
+    public function __construct(IAppData $appData, IRootFolder $rootFolder) {
+        $this->appData = $appData;
+        $this->rootFolder = $rootFolder;
+    }
 
-	/*
+    /*
 	 * @inheritdoc
 	 */
-	public function getName() {
-		return 'Move theming files to AppData storage';
-	}
+    public function getName() {
+        return 'Move theming files to AppData storage';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		$folder = $this->appData->newFolder("images");
-		/** @var File $file */
-		$file = null;
-		try {
-			$file = $this->rootFolder->get('themedinstancelogo');
-			$logo = $folder->newFile('logo');
-			$logo->putContent($file->getContent());
-			$file->delete();
-		} catch (NotFoundException $e) {
-			$output->info('No theming logo image to migrate');
-		}
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        $folder = $this->appData->newFolder("images");
+        /** @var File $file */
+        $file = null;
+        try {
+            $file = $this->rootFolder->get('themedinstancelogo');
+            $logo = $folder->newFile('logo');
+            $logo->putContent($file->getContent());
+            $file->delete();
+        } catch (NotFoundException $e) {
+            $output->info('No theming logo image to migrate');
+        }
 
-		try {
-			$file = $this->rootFolder->get('themedbackgroundlogo');
-			$background = $folder->newFile('background');
-			$background->putContent($file->getContent());
-			$file->delete();
-		} catch (NotFoundException $e) {
-			$output->info('No theming background image to migrate');
-		}
-	}
+        try {
+            $file = $this->rootFolder->get('themedbackgroundlogo');
+            $background = $folder->newFile('background');
+            $background->putContent($file->getContent());
+            $file->delete();
+        } catch (NotFoundException $e) {
+            $output->info('No theming background image to migrate');
+        }
+    }
 }

lib/private/Repair/RepairInvalidShares.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 
 		$updatedEntries = $builder->execute();
 		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+			$out->info('Fixed file share permissions for '.$updatedEntries.' shares');
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 		}
 
 		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+			$out->info('Removed '.$deletedEntries.' shares where the parent did not exist');
 		}
 	}
 

Indentation +86 added lines, -86 removed lines

@@ -33,90 +33,90 @@
  */
 class RepairInvalidShares implements IRepairStep {
 
-	const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IConfig */
-	protected $config;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct($config, $connection) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair invalid shares';
-	}
-
-	/**
-	 * Adjust file share permissions
-	 * @suppress SqlInjectionChecker
-	 */
-	private function adjustFileSharePermissions(IOutput $out) {
-		$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
-		$builder = $this->connection->getQueryBuilder();
-
-		$permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
-		$builder
-			->update('share')
-			->set('permissions', $permsFunc)
-			->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
-			->andWhere($builder->expr()->neq('permissions', $permsFunc));
-
-		$updatedEntries = $builder->execute();
-		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
-		}
-	}
-
-	/**
-	 * Remove shares where the parent share does not exist anymore
-	 */
-	private function removeSharesNonExistingParent(IOutput $out) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.parent')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				->andWhere($query->expr()->isNull('s2.id'))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
-			->groupBy('s1.parent')
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
-		}
-	}
-
-	public function run(IOutput $out) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
-			$this->adjustFileSharePermissions($out);
-		}
-
-		$this->removeSharesNonExistingParent($out);
-	}
+    const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IConfig */
+    protected $config;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct($config, $connection) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair invalid shares';
+    }
+
+    /**
+     * Adjust file share permissions
+     * @suppress SqlInjectionChecker
+     */
+    private function adjustFileSharePermissions(IOutput $out) {
+        $mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
+        $builder = $this->connection->getQueryBuilder();
+
+        $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
+        $builder
+            ->update('share')
+            ->set('permissions', $permsFunc)
+            ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
+            ->andWhere($builder->expr()->neq('permissions', $permsFunc));
+
+        $updatedEntries = $builder->execute();
+        if ($updatedEntries > 0) {
+            $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+        }
+    }
+
+    /**
+     * Remove shares where the parent share does not exist anymore
+     */
+    private function removeSharesNonExistingParent(IOutput $out) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.parent')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                ->andWhere($query->expr()->isNull('s2.id'))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
+            ->groupBy('s1.parent')
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        if ($deletedEntries) {
+            $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+        }
+    }
+
+    public function run(IOutput $out) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
+            $this->adjustFileSharePermissions($out);
+        }
+
+        $this->removeSharesNonExistingParent($out);
+    }
 }

apps/dav/lib/CardDAV/AddressBook.php

Doc Comments +3 added lines

@@ -194,6 +194,9 @@
 		parent::propPatch($propPatch);
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getContactsGroups() {
 		return $this->carddavBackend->collectCardProperties($this->getResourceId(), 'CATEGORIES');
 	}

Spacing +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
 	}
 
 	public function getACL() {
-		$acl =  [
+		$acl = [
 			[
 				'privilege' => '{DAV:}read',
 				'principal' => $this->getOwner(),
@@ -111,7 +111,7 @@ 
 				'protected' => true,
 			];
 		if ($this->getOwner() !== parent::getOwner()) {
-			$acl[] =  [
+			$acl[] = [
 					'privilege' => '{DAV:}read',
 					'principal' => parent::getOwner(),
 					'protected' => true,
@@ -170,7 +170,7 @@ 
 
 	public function delete() {
 		if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
-			$principal = 'principal:' . parent::getOwner();
+			$principal = 'principal:'.parent::getOwner();
 			$shares = $this->carddavBackend->getShares($this->getResourceId());
 			$shares = array_filter($shares, function($share) use ($principal){
 				return $share['href'] === $principal;

Indentation +175 added lines, -175 removed lines

@@ -38,179 +38,179 @@
  */
 class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
 
-	/**
-	 * AddressBook constructor.
-	 *
-	 * @param BackendInterface $carddavBackend
-	 * @param array $addressBookInfo
-	 * @param IL10N $l10n
-	 */
-	public function __construct(BackendInterface $carddavBackend, array $addressBookInfo, IL10N $l10n) {
-		parent::__construct($carddavBackend, $addressBookInfo);
-
-		if ($this->addressBookInfo['{DAV:}displayname'] === CardDavBackend::PERSONAL_ADDRESSBOOK_NAME &&
-			$this->getName() === CardDavBackend::PERSONAL_ADDRESSBOOK_URI) {
-			$this->addressBookInfo['{DAV:}displayname'] = $l10n->t('Contacts');
-		}
-	}
-
-	/**
-	 * Updates the list of shares.
-	 *
-	 * The first array is a list of people that are to be added to the
-	 * addressbook.
-	 *
-	 * Every element in the add array has the following properties:
-	 *   * href - A url. Usually a mailto: address
-	 *   * commonName - Usually a first and last name, or false
-	 *   * summary - A description of the share, can also be false
-	 *   * readOnly - A boolean value
-	 *
-	 * Every element in the remove array is just the address string.
-	 *
-	 * @param array $add
-	 * @param array $remove
-	 * @return void
-	 * @throws Forbidden
-	 */
-	public function updateShares(array $add, array $remove) {
-		if ($this->isShared()) {
-			throw new Forbidden();
-		}
-		$this->carddavBackend->updateShares($this, $add, $remove);
-	}
-
-	/**
-	 * Returns the list of people whom this addressbook is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *   * summary - Optional, a description for the share
-	 *
-	 * @return array
-	 */
-	public function getShares() {
-		if ($this->isShared()) {
-			return [];
-		}
-		return $this->carddavBackend->getShares($this->getResourceId());
-	}
-
-	public function getACL() {
-		$acl =  [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			]];
-		$acl[] = [
-				'privilege' => '{DAV:}write',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			];
-		if ($this->getOwner() !== parent::getOwner()) {
-			$acl[] =  [
-					'privilege' => '{DAV:}read',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			if ($this->canWrite()) {
-				$acl[] = [
-					'privilege' => '{DAV:}write',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			}
-		}
-		if ($this->getOwner() === 'principals/system/system') {
-			$acl[] = [
-					'privilege' => '{DAV:}read',
-					'principal' => '{DAV:}authenticated',
-					'protected' => true,
-			];
-		}
-
-		if ($this->isShared()) {
-			return $acl;
-		}
-
-		return $this->carddavBackend->applyShareAcl($this->getResourceId(), $acl);
-	}
-
-	public function getChildACL() {
-		return $this->getACL();
-	}
-
-	public function getChild($name) {
-
-		$obj = $this->carddavBackend->getCard($this->addressBookInfo['id'], $name);
-		if (!$obj) {
-			throw new NotFound('Card not found');
-		}
-		$obj['acl'] = $this->getChildACL();
-		return new Card($this->carddavBackend, $this->addressBookInfo, $obj);
-
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getResourceId() {
-		return $this->addressBookInfo['id'];
-	}
-
-	public function getOwner() {
-		if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return $this->addressBookInfo['{http://owncloud.org/ns}owner-principal'];
-		}
-		return parent::getOwner();
-	}
-
-	public function delete() {
-		if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
-			$principal = 'principal:' . parent::getOwner();
-			$shares = $this->carddavBackend->getShares($this->getResourceId());
-			$shares = array_filter($shares, function($share) use ($principal){
-				return $share['href'] === $principal;
-			});
-			if (empty($shares)) {
-				throw new Forbidden();
-			}
-
-			$this->carddavBackend->updateShares($this, [], [
-				$principal
-			]);
-			return;
-		}
-		parent::delete();
-	}
-
-	public function propPatch(PropPatch $propPatch) {
-		if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
-			throw new Forbidden();
-		}
-		parent::propPatch($propPatch);
-	}
-
-	public function getContactsGroups() {
-		return $this->carddavBackend->collectCardProperties($this->getResourceId(), 'CATEGORIES');
-	}
-
-	private function isShared() {
-		if (!isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return false;
-		}
-
-		return $this->addressBookInfo['{http://owncloud.org/ns}owner-principal'] !== $this->addressBookInfo['principaluri'];
-	}
-
-	private function canWrite() {
-		if (isset($this->addressBookInfo['{http://owncloud.org/ns}read-only'])) {
-			return !$this->addressBookInfo['{http://owncloud.org/ns}read-only'];
-		}
-		return true;
-	}
+    /**
+     * AddressBook constructor.
+     *
+     * @param BackendInterface $carddavBackend
+     * @param array $addressBookInfo
+     * @param IL10N $l10n
+     */
+    public function __construct(BackendInterface $carddavBackend, array $addressBookInfo, IL10N $l10n) {
+        parent::__construct($carddavBackend, $addressBookInfo);
+
+        if ($this->addressBookInfo['{DAV:}displayname'] === CardDavBackend::PERSONAL_ADDRESSBOOK_NAME &&
+            $this->getName() === CardDavBackend::PERSONAL_ADDRESSBOOK_URI) {
+            $this->addressBookInfo['{DAV:}displayname'] = $l10n->t('Contacts');
+        }
+    }
+
+    /**
+     * Updates the list of shares.
+     *
+     * The first array is a list of people that are to be added to the
+     * addressbook.
+     *
+     * Every element in the add array has the following properties:
+     *   * href - A url. Usually a mailto: address
+     *   * commonName - Usually a first and last name, or false
+     *   * summary - A description of the share, can also be false
+     *   * readOnly - A boolean value
+     *
+     * Every element in the remove array is just the address string.
+     *
+     * @param array $add
+     * @param array $remove
+     * @return void
+     * @throws Forbidden
+     */
+    public function updateShares(array $add, array $remove) {
+        if ($this->isShared()) {
+            throw new Forbidden();
+        }
+        $this->carddavBackend->updateShares($this, $add, $remove);
+    }
+
+    /**
+     * Returns the list of people whom this addressbook is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *   * summary - Optional, a description for the share
+     *
+     * @return array
+     */
+    public function getShares() {
+        if ($this->isShared()) {
+            return [];
+        }
+        return $this->carddavBackend->getShares($this->getResourceId());
+    }
+
+    public function getACL() {
+        $acl =  [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ]];
+        $acl[] = [
+                'privilege' => '{DAV:}write',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ];
+        if ($this->getOwner() !== parent::getOwner()) {
+            $acl[] =  [
+                    'privilege' => '{DAV:}read',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            if ($this->canWrite()) {
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            }
+        }
+        if ($this->getOwner() === 'principals/system/system') {
+            $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => '{DAV:}authenticated',
+                    'protected' => true,
+            ];
+        }
+
+        if ($this->isShared()) {
+            return $acl;
+        }
+
+        return $this->carddavBackend->applyShareAcl($this->getResourceId(), $acl);
+    }
+
+    public function getChildACL() {
+        return $this->getACL();
+    }
+
+    public function getChild($name) {
+
+        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'], $name);
+        if (!$obj) {
+            throw new NotFound('Card not found');
+        }
+        $obj['acl'] = $this->getChildACL();
+        return new Card($this->carddavBackend, $this->addressBookInfo, $obj);
+
+    }
+
+    /**
+     * @return int
+     */
+    public function getResourceId() {
+        return $this->addressBookInfo['id'];
+    }
+
+    public function getOwner() {
+        if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return $this->addressBookInfo['{http://owncloud.org/ns}owner-principal'];
+        }
+        return parent::getOwner();
+    }
+
+    public function delete() {
+        if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
+            $principal = 'principal:' . parent::getOwner();
+            $shares = $this->carddavBackend->getShares($this->getResourceId());
+            $shares = array_filter($shares, function($share) use ($principal){
+                return $share['href'] === $principal;
+            });
+            if (empty($shares)) {
+                throw new Forbidden();
+            }
+
+            $this->carddavBackend->updateShares($this, [], [
+                $principal
+            ]);
+            return;
+        }
+        parent::delete();
+    }
+
+    public function propPatch(PropPatch $propPatch) {
+        if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
+            throw new Forbidden();
+        }
+        parent::propPatch($propPatch);
+    }
+
+    public function getContactsGroups() {
+        return $this->carddavBackend->collectCardProperties($this->getResourceId(), 'CATEGORIES');
+    }
+
+    private function isShared() {
+        if (!isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return false;
+        }
+
+        return $this->addressBookInfo['{http://owncloud.org/ns}owner-principal'] !== $this->addressBookInfo['principaluri'];
+    }
+
+    private function canWrite() {
+        if (isset($this->addressBookInfo['{http://owncloud.org/ns}read-only'])) {
+            return !$this->addressBookInfo['{http://owncloud.org/ns}read-only'];
+        }
+        return true;
+    }
 }