nextcloud / server

lib/private/Files/Search/SearchBinaryOperator.php

Indentation +26 added lines, -26 removed lines

@@ -25,33 +25,33 @@
 use OCP\Files\Search\ISearchOperator;
 
 class SearchBinaryOperator implements ISearchBinaryOperator {
-	/** @var string */
-	private $type;
-	/** @var ISearchOperator[] */
-	private $arguments;
+    /** @var string */
+    private $type;
+    /** @var ISearchOperator[] */
+    private $arguments;
 
-	/**
-	 * SearchBinaryOperator constructor.
-	 *
-	 * @param string $type
-	 * @param ISearchOperator[] $arguments
-	 */
-	public function __construct($type, array $arguments) {
-		$this->type = $type;
-		$this->arguments = $arguments;
-	}
+    /**
+     * SearchBinaryOperator constructor.
+     *
+     * @param string $type
+     * @param ISearchOperator[] $arguments
+     */
+    public function __construct($type, array $arguments) {
+        $this->type = $type;
+        $this->arguments = $arguments;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * @return ISearchOperator[]
-	 */
-	public function getArguments() {
-		return $this->arguments;
-	}
+    /**
+     * @return ISearchOperator[]
+     */
+    public function getArguments() {
+        return $this->arguments;
+    }
 }

lib/private/Files/Cache/Wrapper/CacheWrapper.php

Indentation +264 added lines, -264 removed lines

@@ -34,296 +34,296 @@
 use OCP\Files\Search\ISearchQuery;
 
 class CacheWrapper extends Cache {
-	/**
-	 * @var \OCP\Files\Cache\ICache
-	 */
-	protected $cache;
+    /**
+     * @var \OCP\Files\Cache\ICache
+     */
+    protected $cache;
 
-	/**
-	 * @param \OCP\Files\Cache\ICache $cache
-	 */
-	public function __construct($cache) {
-		$this->cache = $cache;
-	}
+    /**
+     * @param \OCP\Files\Cache\ICache $cache
+     */
+    public function __construct($cache) {
+        $this->cache = $cache;
+    }
 
-	protected function getCache() {
-		return $this->cache;
-	}
+    protected function getCache() {
+        return $this->cache;
+    }
 
-	/**
-	 * Make it easy for wrappers to modify every returned cache entry
-	 *
-	 * @param ICacheEntry $entry
-	 * @return ICacheEntry
-	 */
-	protected function formatCacheEntry($entry) {
-		return $entry;
-	}
+    /**
+     * Make it easy for wrappers to modify every returned cache entry
+     *
+     * @param ICacheEntry $entry
+     * @return ICacheEntry
+     */
+    protected function formatCacheEntry($entry) {
+        return $entry;
+    }
 
-	/**
-	 * get the stored metadata of a file or folder
-	 *
-	 * @param string|int $file
-	 * @return ICacheEntry|false
-	 */
-	public function get($file) {
-		$result = $this->getCache()->get($file);
-		if ($result) {
-			$result = $this->formatCacheEntry($result);
-		}
-		return $result;
-	}
+    /**
+     * get the stored metadata of a file or folder
+     *
+     * @param string|int $file
+     * @return ICacheEntry|false
+     */
+    public function get($file) {
+        $result = $this->getCache()->get($file);
+        if ($result) {
+            $result = $this->formatCacheEntry($result);
+        }
+        return $result;
+    }
 
-	/**
-	 * get the metadata of all files stored in $folder
-	 *
-	 * @param string $folder
-	 * @return ICacheEntry[]
-	 */
-	public function getFolderContents($folder) {
-		// can't do a simple $this->getCache()->.... call here since getFolderContentsById needs to be called on this
-		// and not the wrapped cache
-		$fileId = $this->getId($folder);
-		return $this->getFolderContentsById($fileId);
-	}
+    /**
+     * get the metadata of all files stored in $folder
+     *
+     * @param string $folder
+     * @return ICacheEntry[]
+     */
+    public function getFolderContents($folder) {
+        // can't do a simple $this->getCache()->.... call here since getFolderContentsById needs to be called on this
+        // and not the wrapped cache
+        $fileId = $this->getId($folder);
+        return $this->getFolderContentsById($fileId);
+    }
 
-	/**
-	 * get the metadata of all files stored in $folder
-	 *
-	 * @param int $fileId the file id of the folder
-	 * @return array
-	 */
-	public function getFolderContentsById($fileId) {
-		$results = $this->getCache()->getFolderContentsById($fileId);
-		return array_map(array($this, 'formatCacheEntry'), $results);
-	}
+    /**
+     * get the metadata of all files stored in $folder
+     *
+     * @param int $fileId the file id of the folder
+     * @return array
+     */
+    public function getFolderContentsById($fileId) {
+        $results = $this->getCache()->getFolderContentsById($fileId);
+        return array_map(array($this, 'formatCacheEntry'), $results);
+    }
 
-	/**
-	 * insert or update meta data for a file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	public function put($file, array $data) {
-		if (($id = $this->getId($file)) > -1) {
-			$this->update($id, $data);
-			return $id;
-		} else {
-			return $this->insert($file, $data);
-		}
-	}
+    /**
+     * insert or update meta data for a file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    public function put($file, array $data) {
+        if (($id = $this->getId($file)) > -1) {
+            $this->update($id, $data);
+            return $id;
+        } else {
+            return $this->insert($file, $data);
+        }
+    }
 
-	/**
-	 * insert meta data for a new file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	public function insert($file, array $data) {
-		return $this->getCache()->insert($file, $data);
-	}
+    /**
+     * insert meta data for a new file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    public function insert($file, array $data) {
+        return $this->getCache()->insert($file, $data);
+    }
 
-	/**
-	 * update the metadata in the cache
-	 *
-	 * @param int $id
-	 * @param array $data
-	 */
-	public function update($id, array $data) {
-		$this->getCache()->update($id, $data);
-	}
+    /**
+     * update the metadata in the cache
+     *
+     * @param int $id
+     * @param array $data
+     */
+    public function update($id, array $data) {
+        $this->getCache()->update($id, $data);
+    }
 
-	/**
-	 * get the file id for a file
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getId($file) {
-		return $this->getCache()->getId($file);
-	}
+    /**
+     * get the file id for a file
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getId($file) {
+        return $this->getCache()->getId($file);
+    }
 
-	/**
-	 * get the id of the parent folder of a file
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getParentId($file) {
-		return $this->getCache()->getParentId($file);
-	}
+    /**
+     * get the id of the parent folder of a file
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getParentId($file) {
+        return $this->getCache()->getParentId($file);
+    }
 
-	/**
-	 * check if a file is available in the cache
-	 *
-	 * @param string $file
-	 * @return bool
-	 */
-	public function inCache($file) {
-		return $this->getCache()->inCache($file);
-	}
+    /**
+     * check if a file is available in the cache
+     *
+     * @param string $file
+     * @return bool
+     */
+    public function inCache($file) {
+        return $this->getCache()->inCache($file);
+    }
 
-	/**
-	 * remove a file or folder from the cache
-	 *
-	 * @param string $file
-	 */
-	public function remove($file) {
-		$this->getCache()->remove($file);
-	}
+    /**
+     * remove a file or folder from the cache
+     *
+     * @param string $file
+     */
+    public function remove($file) {
+        $this->getCache()->remove($file);
+    }
 
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * @param string $source
-	 * @param string $target
-	 */
-	public function move($source, $target) {
-		$this->getCache()->move($source, $target);
-	}
+    /**
+     * Move a file or folder in the cache
+     *
+     * @param string $source
+     * @param string $target
+     */
+    public function move($source, $target) {
+        $this->getCache()->move($source, $target);
+    }
 
-	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
-		$this->getCache()->moveFromCache($sourceCache, $sourcePath, $targetPath);
-	}
+    public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
+        $this->getCache()->moveFromCache($sourceCache, $sourcePath, $targetPath);
+    }
 
-	/**
-	 * remove all entries for files that are stored on the storage from the cache
-	 */
-	public function clear() {
-		$this->getCache()->clear();
-	}
+    /**
+     * remove all entries for files that are stored on the storage from the cache
+     */
+    public function clear() {
+        $this->getCache()->clear();
+    }
 
-	/**
-	 * @param string $file
-	 *
-	 * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
-	 */
-	public function getStatus($file) {
-		return $this->getCache()->getStatus($file);
-	}
+    /**
+     * @param string $file
+     *
+     * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
+     */
+    public function getStatus($file) {
+        return $this->getCache()->getStatus($file);
+    }
 
-	/**
-	 * search for files matching $pattern
-	 *
-	 * @param string $pattern
-	 * @return ICacheEntry[] an array of file data
-	 */
-	public function search($pattern) {
-		$results = $this->getCache()->search($pattern);
-		return array_map(array($this, 'formatCacheEntry'), $results);
-	}
+    /**
+     * search for files matching $pattern
+     *
+     * @param string $pattern
+     * @return ICacheEntry[] an array of file data
+     */
+    public function search($pattern) {
+        $results = $this->getCache()->search($pattern);
+        return array_map(array($this, 'formatCacheEntry'), $results);
+    }
 
-	/**
-	 * search for files by mimetype
-	 *
-	 * @param string $mimetype
-	 * @return ICacheEntry[]
-	 */
-	public function searchByMime($mimetype) {
-		$results = $this->getCache()->searchByMime($mimetype);
-		return array_map(array($this, 'formatCacheEntry'), $results);
-	}
+    /**
+     * search for files by mimetype
+     *
+     * @param string $mimetype
+     * @return ICacheEntry[]
+     */
+    public function searchByMime($mimetype) {
+        $results = $this->getCache()->searchByMime($mimetype);
+        return array_map(array($this, 'formatCacheEntry'), $results);
+    }
 
-	public function searchQuery(ISearchQuery $query) {
-		$results = $this->getCache()->searchQuery($query);
-		return array_map(array($this, 'formatCacheEntry'), $results);
-	}
+    public function searchQuery(ISearchQuery $query) {
+        $results = $this->getCache()->searchQuery($query);
+        return array_map(array($this, 'formatCacheEntry'), $results);
+    }
 
-	/**
-	 * search for files by tag
-	 *
-	 * @param string|int $tag name or tag id
-	 * @param string $userId owner of the tags
-	 * @return ICacheEntry[] file data
-	 */
-	public function searchByTag($tag, $userId) {
-		$results = $this->getCache()->searchByTag($tag, $userId);
-		return array_map(array($this, 'formatCacheEntry'), $results);
-	}
+    /**
+     * search for files by tag
+     *
+     * @param string|int $tag name or tag id
+     * @param string $userId owner of the tags
+     * @return ICacheEntry[] file data
+     */
+    public function searchByTag($tag, $userId) {
+        $results = $this->getCache()->searchByTag($tag, $userId);
+        return array_map(array($this, 'formatCacheEntry'), $results);
+    }
 
-	/**
-	 * update the folder size and the size of all parent folders
-	 *
-	 * @param string|boolean $path
-	 * @param array $data (optional) meta data of the folder
-	 */
-	public function correctFolderSize($path, $data = null) {
-		if ($this->getCache() instanceof Cache) {
-			$this->getCache()->correctFolderSize($path, $data);
-		}
-	}
+    /**
+     * update the folder size and the size of all parent folders
+     *
+     * @param string|boolean $path
+     * @param array $data (optional) meta data of the folder
+     */
+    public function correctFolderSize($path, $data = null) {
+        if ($this->getCache() instanceof Cache) {
+            $this->getCache()->correctFolderSize($path, $data);
+        }
+    }
 
-	/**
-	 * get the size of a folder and set it in the cache
-	 *
-	 * @param string $path
-	 * @param array $entry (optional) meta data of the folder
-	 * @return int
-	 */
-	public function calculateFolderSize($path, $entry = null) {
-		if ($this->getCache() instanceof Cache) {
-			return $this->getCache()->calculateFolderSize($path, $entry);
-		} else {
-			return 0;
-		}
-	}
+    /**
+     * get the size of a folder and set it in the cache
+     *
+     * @param string $path
+     * @param array $entry (optional) meta data of the folder
+     * @return int
+     */
+    public function calculateFolderSize($path, $entry = null) {
+        if ($this->getCache() instanceof Cache) {
+            return $this->getCache()->calculateFolderSize($path, $entry);
+        } else {
+            return 0;
+        }
+    }
 
-	/**
-	 * get all file ids on the files on the storage
-	 *
-	 * @return int[]
-	 */
-	public function getAll() {
-		return $this->getCache()->getAll();
-	}
+    /**
+     * get all file ids on the files on the storage
+     *
+     * @return int[]
+     */
+    public function getAll() {
+        return $this->getCache()->getAll();
+    }
 
-	/**
-	 * find a folder in the cache which has not been fully scanned
-	 *
-	 * If multiple incomplete folders are in the cache, the one with the highest id will be returned,
-	 * use the one with the highest id gives the best result with the background scanner, since that is most
-	 * likely the folder where we stopped scanning previously
-	 *
-	 * @return string|bool the path of the folder or false when no folder matched
-	 */
-	public function getIncomplete() {
-		return $this->getCache()->getIncomplete();
-	}
+    /**
+     * find a folder in the cache which has not been fully scanned
+     *
+     * If multiple incomplete folders are in the cache, the one with the highest id will be returned,
+     * use the one with the highest id gives the best result with the background scanner, since that is most
+     * likely the folder where we stopped scanning previously
+     *
+     * @return string|bool the path of the folder or false when no folder matched
+     */
+    public function getIncomplete() {
+        return $this->getCache()->getIncomplete();
+    }
 
-	/**
-	 * get the path of a file on this storage by it's id
-	 *
-	 * @param int $id
-	 * @return string|null
-	 */
-	public function getPathById($id) {
-		return $this->getCache()->getPathById($id);
-	}
+    /**
+     * get the path of a file on this storage by it's id
+     *
+     * @param int $id
+     * @return string|null
+     */
+    public function getPathById($id) {
+        return $this->getCache()->getPathById($id);
+    }
 
-	/**
-	 * Returns the numeric storage id
-	 *
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		return $this->getCache()->getNumericStorageId();
-	}
+    /**
+     * Returns the numeric storage id
+     *
+     * @return int
+     */
+    public function getNumericStorageId() {
+        return $this->getCache()->getNumericStorageId();
+    }
 
-	/**
-	 * get the storage id of the storage for a file and the internal path of the file
-	 * unlike getPathById this does not limit the search to files on this storage and
-	 * instead does a global search in the cache table
-	 *
-	 * @param int $id
-	 * @return array first element holding the storage id, second the path
-	 */
-	static public function getById($id) {
-		return parent::getById($id);
-	}
+    /**
+     * get the storage id of the storage for a file and the internal path of the file
+     * unlike getPathById this does not limit the search to files on this storage and
+     * instead does a global search in the cache table
+     *
+     * @param int $id
+     * @return array first element holding the storage id, second the path
+     */
+    static public function getById($id) {
+        return parent::getById($id);
+    }
 }

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>
 		

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;
+    }
 }

core/Command/Encryption/DecryptAll.php

Indentation +135 added lines, -135 removed lines

@@ -38,139 +38,139 @@
 
 class DecryptAll extends Command {
 
-	/** @var IManager */
-	protected $encryptionManager;
-
-	/** @var  IAppManager */
-	protected $appManager;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var  QuestionHelper */
-	protected $questionHelper;
-
-	/** @var bool */
-	protected $wasTrashbinEnabled;
-
-	/** @var  bool */
-	protected $wasMaintenanceModeEnabled;
-
-	/** @var \OC\Encryption\DecryptAll */
-	protected $decryptAll;
-
-	/**
-	 * @param IManager $encryptionManager
-	 * @param IAppManager $appManager
-	 * @param IConfig $config
-	 * @param \OC\Encryption\DecryptAll $decryptAll
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(
-		IManager $encryptionManager,
-		IAppManager $appManager,
-		IConfig $config,
-		\OC\Encryption\DecryptAll $decryptAll,
-		QuestionHelper $questionHelper
-	) {
-		parent::__construct();
-
-		$this->appManager = $appManager;
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-		$this->decryptAll = $decryptAll;
-		$this->questionHelper = $questionHelper;
-	}
-
-	/**
-	 * Set maintenance mode and disable the trashbin app
-	 */
-	protected function forceMaintenanceAndTrashbin() {
-		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
-		$this->wasMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
-		$this->config->setSystemValue('maintenance', true);
-		$this->appManager->disableApp('files_trashbin');
-	}
-
-	/**
-	 * Reset the maintenance mode and re-enable the trashbin app
-	 */
-	protected function resetMaintenanceAndTrashbin() {
-		$this->config->setSystemValue('maintenance', $this->wasMaintenanceModeEnabled);
-		if ($this->wasTrashbinEnabled) {
-			$this->appManager->enableApp('files_trashbin');
-		}
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this->setName('encryption:decrypt-all');
-		$this->setDescription('Disable server-side encryption and decrypt all files');
-		$this->setHelp(
-			'This will disable server-side encryption and decrypt all files for '
-			. 'all users if it is supported by your encryption module. '
-			. 'Please make sure that no user access his files during this process!'
-		);
-		$this->addArgument(
-			'user',
-			InputArgument::OPTIONAL,
-			'user for which you want to decrypt all files (optional)',
-			''
-		);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-
-		try {
-			if ($this->encryptionManager->isEnabled() === true) {
-				$output->write('Disable server side encryption... ');
-				$this->config->setAppValue('core', 'encryption_enabled', 'no');
-				$output->writeln('done.');
-			} else {
-				$output->writeln('Server side encryption not enabled. Nothing to do.');
-				return;
-			}
-
-			$uid = $input->getArgument('user');
-			if ($uid === '') {
-				$message = 'your Nextcloud';
-			} else {
-				$message = "$uid's account";
-			}
-
-			$output->writeln("\n");
-			$output->writeln("You are about to start to decrypt all files stored in $message.");
-			$output->writeln('It will depend on the encryption module and your setup if this is possible.');
-			$output->writeln('Depending on the number and size of your files this can take some time');
-			$output->writeln('Please make sure that no user access his files during this process!');
-			$output->writeln('');
-			$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
-			if ($this->questionHelper->ask($input, $output, $question)) {
-				$this->forceMaintenanceAndTrashbin();
-				$user = $input->getArgument('user');
-				$result = $this->decryptAll->decryptAll($input, $output, $user);
-				if ($result === false) {
-					$output->writeln(' aborted.');
-					$output->writeln('Server side encryption remains enabled');
-					$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-				} else if ($uid !== '') {
-					$output->writeln('Server side encryption remains enabled');
-					$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-				}
-				$this->resetMaintenanceAndTrashbin();
-			} else {
-				$output->write('Enable server side encryption... ');
-				$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-				$output->writeln('done.');
-				$output->writeln('aborted');
-			}
-		} catch (\Exception $e) {
-			// enable server side encryption again if something went wrong
-			$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-			$this->resetMaintenanceAndTrashbin();
-			throw $e;
-		}
-
-	}
+    /** @var IManager */
+    protected $encryptionManager;
+
+    /** @var  IAppManager */
+    protected $appManager;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var  QuestionHelper */
+    protected $questionHelper;
+
+    /** @var bool */
+    protected $wasTrashbinEnabled;
+
+    /** @var  bool */
+    protected $wasMaintenanceModeEnabled;
+
+    /** @var \OC\Encryption\DecryptAll */
+    protected $decryptAll;
+
+    /**
+     * @param IManager $encryptionManager
+     * @param IAppManager $appManager
+     * @param IConfig $config
+     * @param \OC\Encryption\DecryptAll $decryptAll
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(
+        IManager $encryptionManager,
+        IAppManager $appManager,
+        IConfig $config,
+        \OC\Encryption\DecryptAll $decryptAll,
+        QuestionHelper $questionHelper
+    ) {
+        parent::__construct();
+
+        $this->appManager = $appManager;
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+        $this->decryptAll = $decryptAll;
+        $this->questionHelper = $questionHelper;
+    }
+
+    /**
+     * Set maintenance mode and disable the trashbin app
+     */
+    protected function forceMaintenanceAndTrashbin() {
+        $this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
+        $this->wasMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
+        $this->config->setSystemValue('maintenance', true);
+        $this->appManager->disableApp('files_trashbin');
+    }
+
+    /**
+     * Reset the maintenance mode and re-enable the trashbin app
+     */
+    protected function resetMaintenanceAndTrashbin() {
+        $this->config->setSystemValue('maintenance', $this->wasMaintenanceModeEnabled);
+        if ($this->wasTrashbinEnabled) {
+            $this->appManager->enableApp('files_trashbin');
+        }
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this->setName('encryption:decrypt-all');
+        $this->setDescription('Disable server-side encryption and decrypt all files');
+        $this->setHelp(
+            'This will disable server-side encryption and decrypt all files for '
+            . 'all users if it is supported by your encryption module. '
+            . 'Please make sure that no user access his files during this process!'
+        );
+        $this->addArgument(
+            'user',
+            InputArgument::OPTIONAL,
+            'user for which you want to decrypt all files (optional)',
+            ''
+        );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+
+        try {
+            if ($this->encryptionManager->isEnabled() === true) {
+                $output->write('Disable server side encryption... ');
+                $this->config->setAppValue('core', 'encryption_enabled', 'no');
+                $output->writeln('done.');
+            } else {
+                $output->writeln('Server side encryption not enabled. Nothing to do.');
+                return;
+            }
+
+            $uid = $input->getArgument('user');
+            if ($uid === '') {
+                $message = 'your Nextcloud';
+            } else {
+                $message = "$uid's account";
+            }
+
+            $output->writeln("\n");
+            $output->writeln("You are about to start to decrypt all files stored in $message.");
+            $output->writeln('It will depend on the encryption module and your setup if this is possible.');
+            $output->writeln('Depending on the number and size of your files this can take some time');
+            $output->writeln('Please make sure that no user access his files during this process!');
+            $output->writeln('');
+            $question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
+            if ($this->questionHelper->ask($input, $output, $question)) {
+                $this->forceMaintenanceAndTrashbin();
+                $user = $input->getArgument('user');
+                $result = $this->decryptAll->decryptAll($input, $output, $user);
+                if ($result === false) {
+                    $output->writeln(' aborted.');
+                    $output->writeln('Server side encryption remains enabled');
+                    $this->config->setAppValue('core', 'encryption_enabled', 'yes');
+                } else if ($uid !== '') {
+                    $output->writeln('Server side encryption remains enabled');
+                    $this->config->setAppValue('core', 'encryption_enabled', 'yes');
+                }
+                $this->resetMaintenanceAndTrashbin();
+            } else {
+                $output->write('Enable server side encryption... ');
+                $this->config->setAppValue('core', 'encryption_enabled', 'yes');
+                $output->writeln('done.');
+                $output->writeln('aborted');
+            }
+        } catch (\Exception $e) {
+            // enable server side encryption again if something went wrong
+            $this->config->setAppValue('core', 'encryption_enabled', 'yes');
+            $this->resetMaintenanceAndTrashbin();
+            throw $e;
+        }
+
+    }
 }

lib/private/OCS/Provider.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 			],
 		];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
+		if ($this->appManager->isEnabledForUser('files_sharing')) {
 			$services['SHARING'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -85,7 +85,7 @@ 
 			}
 		}
 
-		if($this->appManager->isEnabledForUser('activity')) {
+		if ($this->appManager->isEnabledForUser('activity')) {
 			$services['ACTIVITY'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -94,7 +94,7 @@ 
 			];
 		}
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
+		if ($this->appManager->isEnabledForUser('provisioning_api')) {
 			$services['PROVISIONING'] = [
 				'version' => 1,
 				'endpoints' => [

Indentation +81 added lines, -81 removed lines

@@ -24,92 +24,92 @@
 namespace OC\OCS;
 
 class Provider extends \OCP\AppFramework\Controller {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param \OCP\IRequest $request
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($appName,
-								\OCP\IRequest $request,
-								\OCP\App\IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $appName
+     * @param \OCP\IRequest $request
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($appName,
+                                \OCP\IRequest $request,
+                                \OCP\App\IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @return \OCP\AppFramework\Http\JSONResponse
-	 */
-	public function buildProviderList() {
-		$services = [
-			'PRIVATE_DATA' => [
-				'version' => 1,
-				'endpoints' => [
-					'store' => '/ocs/v2.php/privatedata/setattribute',
-					'read' => '/ocs/v2.php/privatedata/getattribute',
-					'delete' => '/ocs/v2.php/privatedata/deleteattribute',
-				],
-			],
-		];
+    /**
+     * @return \OCP\AppFramework\Http\JSONResponse
+     */
+    public function buildProviderList() {
+        $services = [
+            'PRIVATE_DATA' => [
+                'version' => 1,
+                'endpoints' => [
+                    'store' => '/ocs/v2.php/privatedata/setattribute',
+                    'read' => '/ocs/v2.php/privatedata/getattribute',
+                    'delete' => '/ocs/v2.php/privatedata/deleteattribute',
+                ],
+            ],
+        ];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
-			$services['SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
-				],
-			];
-			$services['FEDERATED_SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/cloud/shares',
-					'webdav' => '/public.php/webdav/',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('files_sharing')) {
+            $services['SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
+                ],
+            ];
+            $services['FEDERATED_SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/cloud/shares',
+                    'webdav' => '/public.php/webdav/',
+                ],
+            ];
+        }
 
-		if ($this->appManager->isEnabledForUser('federation')) {
-			if (isset($services['FEDERATED_SHARING'])) {
-				$services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
-				$services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
-				$services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
-			} else {
-				$services['FEDERATED_SHARING'] = [
-					'version' => 1,
-					'endpoints' => [
-						'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
-						'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
-						'carddav-user' => 'system'
-					],
-				];
-			}
-		}
+        if ($this->appManager->isEnabledForUser('federation')) {
+            if (isset($services['FEDERATED_SHARING'])) {
+                $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
+                $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
+                $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
+            } else {
+                $services['FEDERATED_SHARING'] = [
+                    'version' => 1,
+                    'endpoints' => [
+                        'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
+                        'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
+                        'carddav-user' => 'system'
+                    ],
+                ];
+            }
+        }
 
-		if($this->appManager->isEnabledForUser('activity')) {
-			$services['ACTIVITY'] = [
-				'version' => 1,
-				'endpoints' => [
-					'list' => '/ocs/v2.php/cloud/activity',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('activity')) {
+            $services['ACTIVITY'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'list' => '/ocs/v2.php/cloud/activity',
+                ],
+            ];
+        }
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
-			$services['PROVISIONING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'user' => '/ocs/v2.php/cloud/users',
-					'groups' => '/ocs/v2.php/cloud/groups',
-					'apps' => '/ocs/v2.php/cloud/apps',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('provisioning_api')) {
+            $services['PROVISIONING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'user' => '/ocs/v2.php/cloud/users',
+                    'groups' => '/ocs/v2.php/cloud/groups',
+                    'apps' => '/ocs/v2.php/cloud/apps',
+                ],
+            ];
+        }
 
-		return new \OCP\AppFramework\Http\JSONResponse([
-			'version' => 2,
-			'services' => $services,
-		]);
-	}
+        return new \OCP\AppFramework\Http\JSONResponse([
+            'version' => 2,
+            'services' => $services,
+        ]);
+    }
 }

apps/dav/lib/DAV/GroupPrincipalBackend.php

Indentation +168 added lines, -168 removed lines

@@ -30,172 +30,172 @@
 
 class GroupPrincipalBackend implements BackendInterface {
 
-	const PRINCIPAL_PREFIX = 'principals/groups';
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/**
-	 * @param IGroupManager $IGroupManager
-	 */
-	public function __construct(IGroupManager $IGroupManager) {
-		$this->groupManager = $IGroupManager;
-	}
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath) {
-		$principals = [];
-
-		if ($prefixPath === self::PRINCIPAL_PREFIX) {
-			foreach($this->groupManager->search('') as $user) {
-				$principals[] = $this->groupToPrincipal($user);
-			}
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by it's path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		$elements = explode('/', $path,  3);
-		if ($elements[0] !== 'principals') {
-			return null;
-		}
-		if ($elements[1] !== 'groups') {
-			return null;
-		}
-		$name = urldecode($elements[2]);
-		$group = $this->groupManager->get($name);
-
-		if (!is_null($group)) {
-			return $this->groupToPrincipal($group);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the list of members for a group-principal
-	 *
-	 * @param string $principal
-	 * @return string[]
-	 * @throws Exception
-	 */
-	public function getGroupMemberSet($principal) {
-		$elements = explode('/', $principal);
-		if ($elements[0] !== 'principals') {
-			return [];
-		}
-		if ($elements[1] !== 'groups') {
-			return [];
-		}
-		$name = $elements[2];
-		$group = $this->groupManager->get($name);
-
-		if (is_null($group)) {
-			return [];
-		}
-
-		return array_map(function($user) {
-			return $this->userToPrincipal($user);
-		}, $group->getUsers());
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getGroupMembership($principal) {
-		return [];
-	}
-
-	/**
-	 * Updates the list of group members for a group principal.
-	 *
-	 * The principals should be passed as a list of uri's.
-	 *
-	 * @param string $principal
-	 * @param string[] $members
-	 * @throws Exception
-	 */
-	public function setGroupMemberSet($principal, array $members) {
-		throw new Exception('Setting members of the group is not supported yet');
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	function updatePrincipal($path, PropPatch $propPatch) {
-		return 0;
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		return [];
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return string
-	 */
-	function findByUri($uri, $principalPrefix) {
-		return '';
-	}
-
-	/**
-	 * @param IGroup $group
-	 * @return array
-	 */
-	protected function groupToPrincipal($group) {
-		$groupId = $group->getGID();
-		$principal = [
-			'uri' => 'principals/groups/' . urlencode($groupId),
-			'{DAV:}displayname' => $groupId,
-		];
-
-		return $principal;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function userToPrincipal($user) {
-		$principal = [
-			'uri' => 'principals/users/' . $user->getUID(),
-			'{DAV:}displayname' => $user->getDisplayName(),
-		];
-
-		return $principal;
-	}
+    const PRINCIPAL_PREFIX = 'principals/groups';
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /**
+     * @param IGroupManager $IGroupManager
+     */
+    public function __construct(IGroupManager $IGroupManager) {
+        $this->groupManager = $IGroupManager;
+    }
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+        $principals = [];
+
+        if ($prefixPath === self::PRINCIPAL_PREFIX) {
+            foreach($this->groupManager->search('') as $user) {
+                $principals[] = $this->groupToPrincipal($user);
+            }
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        $elements = explode('/', $path,  3);
+        if ($elements[0] !== 'principals') {
+            return null;
+        }
+        if ($elements[1] !== 'groups') {
+            return null;
+        }
+        $name = urldecode($elements[2]);
+        $group = $this->groupManager->get($name);
+
+        if (!is_null($group)) {
+            return $this->groupToPrincipal($group);
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return string[]
+     * @throws Exception
+     */
+    public function getGroupMemberSet($principal) {
+        $elements = explode('/', $principal);
+        if ($elements[0] !== 'principals') {
+            return [];
+        }
+        if ($elements[1] !== 'groups') {
+            return [];
+        }
+        $name = $elements[2];
+        $group = $this->groupManager->get($name);
+
+        if (is_null($group)) {
+            return [];
+        }
+
+        return array_map(function($user) {
+            return $this->userToPrincipal($user);
+        }, $group->getUsers());
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     * @throws Exception
+     */
+    public function getGroupMembership($principal) {
+        return [];
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param string[] $members
+     * @throws Exception
+     */
+    public function setGroupMemberSet($principal, array $members) {
+        throw new Exception('Setting members of the group is not supported yet');
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    function updatePrincipal($path, PropPatch $propPatch) {
+        return 0;
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        return [];
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return string
+     */
+    function findByUri($uri, $principalPrefix) {
+        return '';
+    }
+
+    /**
+     * @param IGroup $group
+     * @return array
+     */
+    protected function groupToPrincipal($group) {
+        $groupId = $group->getGID();
+        $principal = [
+            'uri' => 'principals/groups/' . urlencode($groupId),
+            '{DAV:}displayname' => $groupId,
+        ];
+
+        return $principal;
+    }
+
+    /**
+     * @param IUser $user
+     * @return array
+     */
+    protected function userToPrincipal($user) {
+        $principal = [
+            'uri' => 'principals/users/' . $user->getUID(),
+            '{DAV:}displayname' => $user->getDisplayName(),
+        ];
+
+        return $principal;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
 		$principals = [];
 
 		if ($prefixPath === self::PRINCIPAL_PREFIX) {
-			foreach($this->groupManager->search('') as $user) {
+			foreach ($this->groupManager->search('') as $user) {
 				$principals[] = $this->groupToPrincipal($user);
 			}
 		}
@@ -76,7 +76,7 @@ 
 	 * @return array
 	 */
 	public function getPrincipalByPath($path) {
-		$elements = explode('/', $path,  3);
+		$elements = explode('/', $path, 3);
 		if ($elements[0] !== 'principals') {
 			return null;
 		}
@@ -179,7 +179,7 @@ 
 	protected function groupToPrincipal($group) {
 		$groupId = $group->getGID();
 		$principal = [
-			'uri' => 'principals/groups/' . urlencode($groupId),
+			'uri' => 'principals/groups/'.urlencode($groupId),
 			'{DAV:}displayname' => $groupId,
 		];
 
@@ -192,7 +192,7 @@ 
 	 */
 	protected function userToPrincipal($user) {
 		$principal = [
-			'uri' => 'principals/users/' . $user->getUID(),
+			'uri' => 'principals/users/'.$user->getUID(),
 			'{DAV:}displayname' => $user->getDisplayName(),
 		];