nextcloud / server

apps/files_trashbin/lib/Trash/TrashManager.php

Spacing +3 added lines, -3 removed lines

@@ -44,10 +44,10 @@ 
 	}
 
 	public function listTrashRoot(IUser $user): array {
-		$items = array_reduce($this->getBackends(), function (array $items, ITrashBackend $backend) use ($user) {
+		$items = array_reduce($this->getBackends(), function(array $items, ITrashBackend $backend) use ($user) {
 			return array_merge($items, $backend->listTrashRoot($user));
 		}, []);
-		usort($items, function (ITrashItem $a, ITrashItem $b) {
+		usort($items, function(ITrashItem $a, ITrashItem $b) {
 			return $a->getDeletedTime() - $b->getDeletedTime();
 		});
 		return $items;
@@ -76,7 +76,7 @@ 
 	 */
 	public function getBackendForStorage(IStorage $storage): ITrashBackend {
 		$fullType = get_class($storage);
-		$foundType = array_reduce(array_keys($this->backends), function ($type, $registeredType) use ($storage) {
+		$foundType = array_reduce(array_keys($this->backends), function($type, $registeredType) use ($storage) {
 			if (
 				$storage->instanceOfStorage($registeredType) &&
 				($type === '' || is_subclass_of($registeredType, $type))

Indentation +98 added lines, -98 removed lines

@@ -27,102 +27,102 @@
 use OCP\IUser;
 
 class TrashManager implements ITrashManager {
-	/** @var ITrashBackend[] */
-	private $backends = [];
-
-	private $trashPaused = false;
-
-	public function registerBackend(string $storageType, ITrashBackend $backend) {
-		$this->backends[$storageType] = $backend;
-	}
-
-	/**
-	 * @return ITrashBackend[]
-	 */
-	private function getBackends(): array {
-		return $this->backends;
-	}
-
-	public function listTrashRoot(IUser $user): array {
-		$items = array_reduce($this->getBackends(), function (array $items, ITrashBackend $backend) use ($user) {
-			return array_merge($items, $backend->listTrashRoot($user));
-		}, []);
-		usort($items, function (ITrashItem $a, ITrashItem $b) {
-			return $a->getDeletedTime() - $b->getDeletedTime();
-		});
-		return $items;
-	}
-
-	private function getBackendForItem(ITrashItem $item) {
-		return $item->getTrashBackend();
-	}
-
-	public function listTrashFolder(ITrashItem $folder): array {
-		return $this->getBackendForItem($folder)->listTrashFolder($folder);
-	}
-
-	public function restoreItem(ITrashItem $item) {
-		return $this->getBackendForItem($item)->restoreItem($item);
-	}
-
-	public function removeItem(ITrashItem $item) {
-		$this->getBackendForItem($item)->removeItem($item);
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @return ITrashBackend
-	 * @throws BackendNotFoundException
-	 */
-	public function getBackendForStorage(IStorage $storage): ITrashBackend {
-		$fullType = get_class($storage);
-		$foundType = array_reduce(array_keys($this->backends), function ($type, $registeredType) use ($storage) {
-			if (
-				$storage->instanceOfStorage($registeredType) &&
-				($type === '' || is_subclass_of($registeredType, $type))
-			) {
-				return $registeredType;
-			} else {
-				return $type;
-			}
-		}, '');
-		if ($foundType === '') {
-			throw new BackendNotFoundException("Trash backend for $fullType not found");
-		} else {
-			return $this->backends[$foundType];
-		}
-	}
-
-	public function moveToTrash(IStorage $storage, string $internalPath): bool {
-		if ($this->trashPaused) {
-			return false;
-		}
-		try {
-			$backend = $this->getBackendForStorage($storage);
-			$this->trashPaused = true;
-			$result = $backend->moveToTrash($storage, $internalPath);
-			$this->trashPaused = false;
-			return $result;
-		} catch (BackendNotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function getTrashNodeById(IUser $user, int $fileId) {
-		foreach ($this->backends as $backend) {
-			$item = $backend->getTrashNodeById($user, $fileId);
-			if ($item !== null) {
-				return $item;
-			}
-		}
-		return null;
-	}
-
-	public function pauseTrash() {
-		$this->trashPaused = true;
-	}
-
-	public function resumeTrash() {
-		$this->trashPaused = false;
-	}
+    /** @var ITrashBackend[] */
+    private $backends = [];
+
+    private $trashPaused = false;
+
+    public function registerBackend(string $storageType, ITrashBackend $backend) {
+        $this->backends[$storageType] = $backend;
+    }
+
+    /**
+     * @return ITrashBackend[]
+     */
+    private function getBackends(): array {
+        return $this->backends;
+    }
+
+    public function listTrashRoot(IUser $user): array {
+        $items = array_reduce($this->getBackends(), function (array $items, ITrashBackend $backend) use ($user) {
+            return array_merge($items, $backend->listTrashRoot($user));
+        }, []);
+        usort($items, function (ITrashItem $a, ITrashItem $b) {
+            return $a->getDeletedTime() - $b->getDeletedTime();
+        });
+        return $items;
+    }
+
+    private function getBackendForItem(ITrashItem $item) {
+        return $item->getTrashBackend();
+    }
+
+    public function listTrashFolder(ITrashItem $folder): array {
+        return $this->getBackendForItem($folder)->listTrashFolder($folder);
+    }
+
+    public function restoreItem(ITrashItem $item) {
+        return $this->getBackendForItem($item)->restoreItem($item);
+    }
+
+    public function removeItem(ITrashItem $item) {
+        $this->getBackendForItem($item)->removeItem($item);
+    }
+
+    /**
+     * @param IStorage $storage
+     * @return ITrashBackend
+     * @throws BackendNotFoundException
+     */
+    public function getBackendForStorage(IStorage $storage): ITrashBackend {
+        $fullType = get_class($storage);
+        $foundType = array_reduce(array_keys($this->backends), function ($type, $registeredType) use ($storage) {
+            if (
+                $storage->instanceOfStorage($registeredType) &&
+                ($type === '' || is_subclass_of($registeredType, $type))
+            ) {
+                return $registeredType;
+            } else {
+                return $type;
+            }
+        }, '');
+        if ($foundType === '') {
+            throw new BackendNotFoundException("Trash backend for $fullType not found");
+        } else {
+            return $this->backends[$foundType];
+        }
+    }
+
+    public function moveToTrash(IStorage $storage, string $internalPath): bool {
+        if ($this->trashPaused) {
+            return false;
+        }
+        try {
+            $backend = $this->getBackendForStorage($storage);
+            $this->trashPaused = true;
+            $result = $backend->moveToTrash($storage, $internalPath);
+            $this->trashPaused = false;
+            return $result;
+        } catch (BackendNotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function getTrashNodeById(IUser $user, int $fileId) {
+        foreach ($this->backends as $backend) {
+            $item = $backend->getTrashNodeById($user, $fileId);
+            if ($item !== null) {
+                return $item;
+            }
+        }
+        return null;
+    }
+
+    public function pauseTrash() {
+        $this->trashPaused = true;
+    }
+
+    public function resumeTrash() {
+        $this->trashPaused = false;
+    }
 }

apps/files_trashbin/lib/Sabre/TrashFolder.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
 
 class TrashFolder extends AbstractTrashFolder {
 	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
+		return $this->data->getName().'.d'.$this->getLastModified();
 	}
 }

Indentation +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@
 namespace OCA\Files_Trashbin\Sabre;
 
 class TrashFolder extends AbstractTrashFolder {
-	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
-	}
+    public function getName(): string {
+        return $this->data->getName() . '.d' . $this->getLastModified();
+    }
 }

apps/files_trashbin/lib/Sabre/TrashRoot.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	public function getChildren(): array {
 		$entries = $this->trashManager->listTrashRoot($this->user);
 
-		$children = array_map(function (ITrashItem $entry) {
+		$children = array_map(function(ITrashItem $entry) {
 			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
 				return new TrashFolder($this->trashManager, $entry);
 			}

Indentation +71 added lines, -71 removed lines

@@ -37,75 +37,75 @@
 
 class TrashRoot implements ICollection {
 
-	/** @var IUser */
-	private $user;
-
-	/** @var ITrashManager  */
-	private $trashManager;
-
-	public function __construct(IUser $user, ITrashManager $trashManager) {
-		$this->user = $user;
-		$this->trashManager = $trashManager;
-	}
-
-	public function delete() {
-		\OCA\Files_Trashbin\Trashbin::deleteAll();
-		foreach ($this->trashManager->listTrashRoot($this->user) as $trashItem) {
-			$this->trashManager->removeItem($trashItem);
-		}
-	}
-
-	public function getName(): string {
-		return 'trash';
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this trashbin');
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Not allowed to create files in the trashbin');
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden('Not allowed to create folders in the trashbin');
-	}
-
-	public function getChildren(): array {
-		$entries = $this->trashManager->listTrashRoot($this->user);
-
-		$children = array_map(function (ITrashItem $entry) {
-			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
-				return new TrashFolder($this->trashManager, $entry);
-			}
-			return new TrashFile($this->trashManager, $entry);
-		}, $entries);
-
-		return $children;
-	}
-
-	public function getChild($name): ITrash {
-		$entries = $this->getChildren();
-
-		foreach ($entries as $entry) {
-			if ($entry->getName() === $name) {
-				return $entry;
-			}
-		}
-
-		throw new NotFound();
-	}
-
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
+    /** @var IUser */
+    private $user;
+
+    /** @var ITrashManager  */
+    private $trashManager;
+
+    public function __construct(IUser $user, ITrashManager $trashManager) {
+        $this->user = $user;
+        $this->trashManager = $trashManager;
+    }
+
+    public function delete() {
+        \OCA\Files_Trashbin\Trashbin::deleteAll();
+        foreach ($this->trashManager->listTrashRoot($this->user) as $trashItem) {
+            $this->trashManager->removeItem($trashItem);
+        }
+    }
+
+    public function getName(): string {
+        return 'trash';
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this trashbin');
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Not allowed to create files in the trashbin');
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden('Not allowed to create folders in the trashbin');
+    }
+
+    public function getChildren(): array {
+        $entries = $this->trashManager->listTrashRoot($this->user);
+
+        $children = array_map(function (ITrashItem $entry) {
+            if ($entry->getType() === FileInfo::TYPE_FOLDER) {
+                return new TrashFolder($this->trashManager, $entry);
+            }
+            return new TrashFile($this->trashManager, $entry);
+        }, $entries);
+
+        return $children;
+    }
+
+    public function getChild($name): ITrash {
+        $entries = $this->getChildren();
+
+        foreach ($entries as $entry) {
+            if ($entry->getName() === $name) {
+                return $entry;
+            }
+        }
+
+        throw new NotFound();
+    }
+
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
 }

apps/files_trashbin/lib/Sabre/AbstractTrashFolder.php

Indentation +36 added lines, -36 removed lines

@@ -29,49 +29,49 @@
 use Sabre\DAV\ICollection;
 
 abstract class AbstractTrashFolder extends AbstractTrash implements ICollection, ITrash {
-	public function getChildren(): array {
-		$entries = $this->trashManager->listTrashFolder($this->data);
+    public function getChildren(): array {
+        $entries = $this->trashManager->listTrashFolder($this->data);
 
-		$children = array_map(function (ITrashItem $entry) {
-			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
-				return new TrashFolderFolder($this->trashManager, $entry);
-			}
-			return new TrashFolderFile($this->trashManager, $entry);
-		}, $entries);
+        $children = array_map(function (ITrashItem $entry) {
+            if ($entry->getType() === FileInfo::TYPE_FOLDER) {
+                return new TrashFolderFolder($this->trashManager, $entry);
+            }
+            return new TrashFolderFile($this->trashManager, $entry);
+        }, $entries);
 
-		return $children;
-	}
+        return $children;
+    }
 
-	public function getChild($name): ITrash {
-		$entries = $this->getChildren();
+    public function getChild($name): ITrash {
+        $entries = $this->getChildren();
 
-		foreach ($entries as $entry) {
-			if ($entry->getName() === $name) {
-				return $entry;
-			}
-		}
+        foreach ($entries as $entry) {
+            if ($entry->getName() === $name) {
+                return $entry;
+            }
+        }
 
-		throw new NotFound();
-	}
+        throw new NotFound();
+    }
 
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	public function getChildren(): array {
 		$entries = $this->trashManager->listTrashFolder($this->data);
 
-		$children = array_map(function (ITrashItem $entry) {
+		$children = array_map(function(ITrashItem $entry) {
 			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
 				return new TrashFolderFolder($this->trashManager, $entry);
 			}

apps/files_trashbin/lib/Sabre/TrashFile.php

Indentation +6 added lines, -6 removed lines

@@ -25,11 +25,11 @@
 namespace OCA\Files_Trashbin\Sabre;
 
 class TrashFile extends AbstractTrashFile {
-	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
-	}
+    public function get() {
+        return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
+    }
 
-	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
-	}
+    public function getName(): string {
+        return $this->data->getName() . '.d' . $this->getLastModified();
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 
 class TrashFile extends AbstractTrashFile {
 	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
+		return $this->data->getStorage()->fopen($this->data->getInternalPath().'.d'.$this->getLastModified(), 'rb');
 	}
 
 	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
+		return $this->data->getName().'.d'.$this->getLastModified();
 	}
 }

apps/files_sharing/templates/public.php

Braces +10 added lines, -4 removed lines

@@ -50,17 +50,23 @@
 		<div id="preview">
 			<?php if (isset($_['folder'])): ?>
 				<?php print_unescaped($_['folder']); ?>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'audio'): ?>
 					<div id="imgframe">
-						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px">
+						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']);
+}
+?>px; max-height: <?php p($_['previewMaxY']); ?>px">
 							<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
 						</audio>
 					</div>
-				<?php else: ?>
+				<?php else {
+    : ?>
 					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
 					<div id="imgframe"></div>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 				<?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?>
 					<div class="directDownload">
 						<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">

Indentation +4 added lines, -4 removed lines

@@ -111,10 +111,10 @@
 			<?php if (!empty($_['disclaimer'])) { ?>
 				<div>
 					<?php
-						echo $l->t('By uploading files, you agree to the %1$sterms of service%2$s.', [
-							'<span id="show-terms-dialog">', '</span>'
-						]);
-					?>
+                        echo $l->t('By uploading files, you agree to the %1$sterms of service%2$s.', [
+                            '<span id="show-terms-dialog">', '</span>'
+                        ]);
+                    ?>
 				</div>
 			<?php } ?>
 		</div>

lib/public/FullTextSearch/Service/ISearchService.php

Indentation +37 added lines, -37 removed lines

@@ -45,45 +45,45 @@
 interface ISearchService {
 
 
-	/**
-	 * generate a search request, based on an array:
-	 *
-	 * $request =
-	 *   [
-	 *        'providers' =>    (string/array) 'all'
-	 *        'author' =>       (string) owner of the document.
-	 *        'search' =>       (string) search string,
-	 *        'size' =>         (int) number of items to be return
-	 *        'page' =>         (int) page
-	 *        'parts' =>        (array) parts of document to search within,
-	 *        'options' =       (array) search options,
-	 *        'tags'     =>     (array) tags,
-	 *        'metatags' =>     (array) metatags,
-	 *        'subtags'  =>     (array) subtags
-	 *   ]
-	 *
-	 * 'providers' can be an array of providerIds
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param array $request
-	 *
-	 * @return ISearchRequest
-	 */
-	public function generateSearchRequest(array $request): ISearchRequest;
+    /**
+     * generate a search request, based on an array:
+     *
+     * $request =
+     *   [
+     *        'providers' =>    (string/array) 'all'
+     *        'author' =>       (string) owner of the document.
+     *        'search' =>       (string) search string,
+     *        'size' =>         (int) number of items to be return
+     *        'page' =>         (int) page
+     *        'parts' =>        (array) parts of document to search within,
+     *        'options' =       (array) search options,
+     *        'tags'     =>     (array) tags,
+     *        'metatags' =>     (array) metatags,
+     *        'subtags'  =>     (array) subtags
+     *   ]
+     *
+     * 'providers' can be an array of providerIds
+     *
+     * @since 15.0.0
+     *
+     * @param array $request
+     *
+     * @return ISearchRequest
+     */
+    public function generateSearchRequest(array $request): ISearchRequest;
 
 
-	/**
-	 * Search documents
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $userId
-	 * @param ISearchRequest $searchRequest
-	 *
-	 * @return ISearchResult[]
-	 */
-	public function search(string $userId, ISearchRequest $searchRequest): array;
+    /**
+     * Search documents
+     *
+     * @since 15.0.0
+     *
+     * @param string $userId
+     * @param ISearchRequest $searchRequest
+     *
+     * @return ISearchResult[]
+     */
+    public function search(string $userId, ISearchRequest $searchRequest): array;
 
 }
 

lib/public/FullTextSearch/Model/IIndexOptions.php

Indentation +33 added lines, -33 removed lines

@@ -46,41 +46,41 @@
 interface IIndexOptions {
 
 
-	/**
-	 * Get the value (as a string) for an option.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $option
-	 * @param string $default
-	 *
-	 * @return string
-	 */
-	public function getOption(string $option, string $default = ''): string;
+    /**
+     * Get the value (as a string) for an option.
+     *
+     * @since 15.0.0
+     *
+     * @param string $option
+     * @param string $default
+     *
+     * @return string
+     */
+    public function getOption(string $option, string $default = ''): string;
 
-	/**
-	 * Get the value (as an array) for an option.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $option
-	 * @param array $default
-	 *
-	 * @return array
-	 */
-	public function getOptionArray(string $option, array $default = []): array;
+    /**
+     * Get the value (as an array) for an option.
+     *
+     * @since 15.0.0
+     *
+     * @param string $option
+     * @param array $default
+     *
+     * @return array
+     */
+    public function getOptionArray(string $option, array $default = []): array;
 
-	/**
-	 * Get the value (as an boolean) for an option.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $option
-	 * @param bool $default
-	 *
-	 * @return bool
-	 */
-	public function getOptionBool(string $option, bool $default): bool;
+    /**
+     * Get the value (as an boolean) for an option.
+     *
+     * @since 15.0.0
+     *
+     * @param string $option
+     * @param bool $default
+     *
+     * @return bool
+     */
+    public function getOptionBool(string $option, bool $default): bool;
 
 }
 

lib/private/Authentication/Exceptions/ExpiredTokenException.php

Indentation +9 added lines, -9 removed lines

@@ -26,16 +26,16 @@
 use OC\Authentication\Token\IToken;
 
 class ExpiredTokenException extends InvalidTokenException {
-	/** @var IToken */
-	private $token;
+    /** @var IToken */
+    private $token;
 
-	public function __construct(IToken $token) {
-		parent::__construct();
+    public function __construct(IToken $token) {
+        parent::__construct();
 
-		$this->token = $token;
-	}
+        $this->token = $token;
+    }
 
-	public function getToken(): IToken {
-		return $this->token;
-	}
+    public function getToken(): IToken {
+        return $this->token;
+    }
 }