nextcloud / server

apps/workflowengine/lib/Check/FileMimeType.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 				if (strpos($path, '/webdav/') === 0) {
 					$path = substr($path, strlen('/webdav'));
 				}
-				$path = $this->path . $path;
+				$path = $this->path.$path;
 				$this->mimeType[$this->storage->getId()][$path] = $this->mimeTypeDetector->detectPath($path);
 				return $this->mimeType[$this->storage->getId()][$path];
 			}

Indentation +166 added lines, -166 removed lines

@@ -29,170 +29,170 @@
 
 class FileMimeType extends AbstractStringCheck {
 
-	/** @var array */
-	protected $mimeType;
-
-	/** @var IRequest */
-	protected $request;
-
-	/** @var IMimeTypeDetector */
-	protected $mimeTypeDetector;
-
-	/** @var IStorage */
-	protected $storage;
-
-	/** @var string */
-	protected $path;
-
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 * @param IMimeTypeDetector $mimeTypeDetector
-	 */
-	public function __construct(IL10N $l, IRequest $request, IMimeTypeDetector $mimeTypeDetector) {
-		parent::__construct($l);
-		$this->request = $request;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 */
-	public function setFileInfo(IStorage $storage, $path) {
-		$this->storage = $storage;
-		$this->path = $path;
-		if (!isset($this->mimeType[$this->storage->getId()][$this->path])
-			|| $this->mimeType[$this->storage->getId()][$this->path] === '') {
-			$this->mimeType[$this->storage->getId()][$this->path] = null;
-		}
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
-			return $this->mimeType[$this->storage->getId()][$this->path];
-		}
-
-		if ($this->storage->is_dir($this->path)) {
-			$this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
-			return $this->mimeType[$this->storage->getId()][$this->path];
-		}
-
-		if ($this->isWebDAVRequest()) {
-			// Creating a folder
-			if ($this->request->getMethod() === 'MKCOL') {
-				$this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
-				return $this->mimeType[$this->storage->getId()][$this->path];
-			}
-
-			if ($this->request->getMethod() === 'PUT' || $this->request->getMethod() === 'MOVE') {
-				if ($this->request->getMethod() === 'MOVE') {
-					$this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($this->path);
-				} else {
-					$path = $this->request->getPathInfo();
-					$this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path);
-				}
-				return $this->mimeType[$this->storage->getId()][$this->path];
-			}
-		} else if ($this->isPublicWebDAVRequest()) {
-			if ($this->request->getMethod() === 'PUT') {
-				$path = $this->request->getPathInfo();
-				if (strpos($path, '/webdav/') === 0) {
-					$path = substr($path, strlen('/webdav'));
-				}
-				$path = $this->path . $path;
-				$this->mimeType[$this->storage->getId()][$path] = $this->mimeTypeDetector->detectPath($path);
-				return $this->mimeType[$this->storage->getId()][$path];
-			}
-		}
-
-		if (in_array($this->request->getMethod(), ['POST', 'PUT'])) {
-			$files = $this->request->getUploadedFile('files');
-			if (isset($files['type'][0])) {
-				$mimeType = $files['type'][0];
-				if ($this->mimeType === 'application/octet-stream') {
-					// Maybe not...
-					$mimeTypeTest = $this->mimeTypeDetector->detectPath($files['name'][0]);
-					if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
-						$mimeType = $mimeTypeTest;
-					} else {
-						$mimeTypeTest = $this->mimeTypeDetector->detect($files['tmp_name'][0]);
-						if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
-							$mimeType = $mimeTypeTest;
-						}
-					}
-				}
-				$this->mimeType[$this->storage->getId()][$this->path] = $mimeType;
-				return $mimeType;
-			}
-		}
-
-		$this->mimeType[$this->storage->getId()][$this->path] = $this->storage->getMimeType($this->path);
-		if ($this->mimeType[$this->storage->getId()][$this->path] === 'application/octet-stream') {
-			$this->mimeType[$this->storage->getId()][$this->path] = $this->detectMimetypeFromPath();
-		}
-
-		return $this->mimeType[$this->storage->getId()][$this->path];
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function detectMimetypeFromPath() {
-		$mimeType = $this->mimeTypeDetector->detectPath($this->path);
-		if ($mimeType !== 'application/octet-stream' && $mimeType !== false) {
-			return $mimeType;
-		}
-
-		if ($this->storage->instanceOfStorage('\OC\Files\Storage\Local')
-			|| $this->storage->instanceOfStorage('\OC\Files\Storage\Home')
-			|| $this->storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')) {
-			$localFile = $this->storage->getLocalFile($this->path);
-			if ($localFile !== false) {
-				$mimeType = $this->mimeTypeDetector->detect($localFile);
-				if ($mimeType !== false) {
-					return $mimeType;
-				}
-			}
-
-			return 'application/octet-stream';
-		} else {
-			$handle = $this->storage->fopen($this->path, 'r');
-			$data = fread($handle, 8024);
-			fclose($handle);
-			$mimeType = $this->mimeTypeDetector->detectString($data);
-			if ($mimeType !== false) {
-				return $mimeType;
-			}
-
-			return 'application/octet-stream';
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
-			$this->request->getPathInfo() === '/dav/files' ||
-			strpos($this->request->getPathInfo(), '/dav/files/') === 0 ||
-			$this->request->getPathInfo() === '/dav/uploads' ||
-			strpos($this->request->getPathInfo(), '/dav/uploads/') === 0
-		);
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isPublicWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			strpos($this->request->getPathInfo(), '/webdav/') === 0
-		);
-	}
+    /** @var array */
+    protected $mimeType;
+
+    /** @var IRequest */
+    protected $request;
+
+    /** @var IMimeTypeDetector */
+    protected $mimeTypeDetector;
+
+    /** @var IStorage */
+    protected $storage;
+
+    /** @var string */
+    protected $path;
+
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     * @param IMimeTypeDetector $mimeTypeDetector
+     */
+    public function __construct(IL10N $l, IRequest $request, IMimeTypeDetector $mimeTypeDetector) {
+        parent::__construct($l);
+        $this->request = $request;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+    }
+
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     */
+    public function setFileInfo(IStorage $storage, $path) {
+        $this->storage = $storage;
+        $this->path = $path;
+        if (!isset($this->mimeType[$this->storage->getId()][$this->path])
+            || $this->mimeType[$this->storage->getId()][$this->path] === '') {
+            $this->mimeType[$this->storage->getId()][$this->path] = null;
+        }
+    }
+
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
+            return $this->mimeType[$this->storage->getId()][$this->path];
+        }
+
+        if ($this->storage->is_dir($this->path)) {
+            $this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
+            return $this->mimeType[$this->storage->getId()][$this->path];
+        }
+
+        if ($this->isWebDAVRequest()) {
+            // Creating a folder
+            if ($this->request->getMethod() === 'MKCOL') {
+                $this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
+                return $this->mimeType[$this->storage->getId()][$this->path];
+            }
+
+            if ($this->request->getMethod() === 'PUT' || $this->request->getMethod() === 'MOVE') {
+                if ($this->request->getMethod() === 'MOVE') {
+                    $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($this->path);
+                } else {
+                    $path = $this->request->getPathInfo();
+                    $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path);
+                }
+                return $this->mimeType[$this->storage->getId()][$this->path];
+            }
+        } else if ($this->isPublicWebDAVRequest()) {
+            if ($this->request->getMethod() === 'PUT') {
+                $path = $this->request->getPathInfo();
+                if (strpos($path, '/webdav/') === 0) {
+                    $path = substr($path, strlen('/webdav'));
+                }
+                $path = $this->path . $path;
+                $this->mimeType[$this->storage->getId()][$path] = $this->mimeTypeDetector->detectPath($path);
+                return $this->mimeType[$this->storage->getId()][$path];
+            }
+        }
+
+        if (in_array($this->request->getMethod(), ['POST', 'PUT'])) {
+            $files = $this->request->getUploadedFile('files');
+            if (isset($files['type'][0])) {
+                $mimeType = $files['type'][0];
+                if ($this->mimeType === 'application/octet-stream') {
+                    // Maybe not...
+                    $mimeTypeTest = $this->mimeTypeDetector->detectPath($files['name'][0]);
+                    if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
+                        $mimeType = $mimeTypeTest;
+                    } else {
+                        $mimeTypeTest = $this->mimeTypeDetector->detect($files['tmp_name'][0]);
+                        if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
+                            $mimeType = $mimeTypeTest;
+                        }
+                    }
+                }
+                $this->mimeType[$this->storage->getId()][$this->path] = $mimeType;
+                return $mimeType;
+            }
+        }
+
+        $this->mimeType[$this->storage->getId()][$this->path] = $this->storage->getMimeType($this->path);
+        if ($this->mimeType[$this->storage->getId()][$this->path] === 'application/octet-stream') {
+            $this->mimeType[$this->storage->getId()][$this->path] = $this->detectMimetypeFromPath();
+        }
+
+        return $this->mimeType[$this->storage->getId()][$this->path];
+    }
+
+    /**
+     * @return string
+     */
+    protected function detectMimetypeFromPath() {
+        $mimeType = $this->mimeTypeDetector->detectPath($this->path);
+        if ($mimeType !== 'application/octet-stream' && $mimeType !== false) {
+            return $mimeType;
+        }
+
+        if ($this->storage->instanceOfStorage('\OC\Files\Storage\Local')
+            || $this->storage->instanceOfStorage('\OC\Files\Storage\Home')
+            || $this->storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')) {
+            $localFile = $this->storage->getLocalFile($this->path);
+            if ($localFile !== false) {
+                $mimeType = $this->mimeTypeDetector->detect($localFile);
+                if ($mimeType !== false) {
+                    return $mimeType;
+                }
+            }
+
+            return 'application/octet-stream';
+        } else {
+            $handle = $this->storage->fopen($this->path, 'r');
+            $data = fread($handle, 8024);
+            fclose($handle);
+            $mimeType = $this->mimeTypeDetector->detectString($data);
+            if ($mimeType !== false) {
+                return $mimeType;
+            }
+
+            return 'application/octet-stream';
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
+            $this->request->getPathInfo() === '/dav/files' ||
+            strpos($this->request->getPathInfo(), '/dav/files/') === 0 ||
+            $this->request->getPathInfo() === '/dav/uploads' ||
+            strpos($this->request->getPathInfo(), '/dav/uploads/') === 0
+        );
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isPublicWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            strpos($this->request->getPathInfo(), '/webdav/') === 0
+        );
+    }
 }

lib/public/Files/Search/ISearchQuery.php

Indentation +33 added lines, -33 removed lines

@@ -27,41 +27,41 @@
  * @since 12.0.0
  */
 interface ISearchQuery {
-	/**
-	 * @return ISearchOperator
-	 * @since 12.0.0
-	 */
-	public function getSearchOperation();
+    /**
+     * @return ISearchOperator
+     * @since 12.0.0
+     */
+    public function getSearchOperation();
 
-	/**
-	 * Get the maximum number of results to return
-	 *
-	 * @return integer
-	 * @since 12.0.0
-	 */
-	public function getLimit();
+    /**
+     * Get the maximum number of results to return
+     *
+     * @return integer
+     * @since 12.0.0
+     */
+    public function getLimit();
 
-	/**
-	 * Get the offset for returned results
-	 *
-	 * @return integer
-	 * @since 12.0.0
-	 */
-	public function getOffset();
+    /**
+     * Get the offset for returned results
+     *
+     * @return integer
+     * @since 12.0.0
+     */
+    public function getOffset();
 
-	/**
-	 * The fields and directions to order by
-	 *
-	 * @return ISearchOrder[]
-	 * @since 12.0.0
-	 */
-	public function getOrder();
+    /**
+     * The fields and directions to order by
+     *
+     * @return ISearchOrder[]
+     * @since 12.0.0
+     */
+    public function getOrder();
 
-	/**
-	 * The user that issued the search
-	 *
-	 * @return IUser
-	 * @since 12.0.0
-	 */
-	public function getUser();
+    /**
+     * The user that issued the search
+     *
+     * @return IUser
+     * @since 12.0.0
+     */
+    public function getUser();
 }

lib/private/Files/Search/SearchQuery.php

Indentation +56 added lines, -56 removed lines

@@ -27,66 +27,66 @@
 use OCP\IUser;
 
 class SearchQuery implements ISearchQuery {
-	/** @var  ISearchOperator */
-	private $searchOperation;
-	/** @var  integer */
-	private $limit;
-	/** @var  integer */
-	private $offset;
-	/** @var  ISearchOrder[] */
-	private $order;
-	/** @var IUser */
-	private $user;
+    /** @var  ISearchOperator */
+    private $searchOperation;
+    /** @var  integer */
+    private $limit;
+    /** @var  integer */
+    private $offset;
+    /** @var  ISearchOrder[] */
+    private $order;
+    /** @var IUser */
+    private $user;
 
-	/**
-	 * SearchQuery constructor.
-	 *
-	 * @param ISearchOperator $searchOperation
-	 * @param int $limit
-	 * @param int $offset
-	 * @param array $order
-	 * @param IUser $user
-	 */
-	public function __construct(ISearchOperator $searchOperation, $limit, $offset, array $order, IUser $user) {
-		$this->searchOperation = $searchOperation;
-		$this->limit = $limit;
-		$this->offset = $offset;
-		$this->order = $order;
-		$this->user = $user;
-	}
+    /**
+     * SearchQuery constructor.
+     *
+     * @param ISearchOperator $searchOperation
+     * @param int $limit
+     * @param int $offset
+     * @param array $order
+     * @param IUser $user
+     */
+    public function __construct(ISearchOperator $searchOperation, $limit, $offset, array $order, IUser $user) {
+        $this->searchOperation = $searchOperation;
+        $this->limit = $limit;
+        $this->offset = $offset;
+        $this->order = $order;
+        $this->user = $user;
+    }
 
-	/**
-	 * @return ISearchOperator
-	 */
-	public function getSearchOperation() {
-		return $this->searchOperation;
-	}
+    /**
+     * @return ISearchOperator
+     */
+    public function getSearchOperation() {
+        return $this->searchOperation;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getLimit() {
-		return $this->limit;
-	}
+    /**
+     * @return int
+     */
+    public function getLimit() {
+        return $this->limit;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getOffset() {
-		return $this->offset;
-	}
+    /**
+     * @return int
+     */
+    public function getOffset() {
+        return $this->offset;
+    }
 
-	/**
-	 * @return ISearchOrder[]
-	 */
-	public function getOrder() {
-		return $this->order;
-	}
+    /**
+     * @return ISearchOrder[]
+     */
+    public function getOrder() {
+        return $this->order;
+    }
 
-	/**
-	 * @return IUser
-	 */
-	public function getUser() {
-		return $this->user;
-	}
+    /**
+     * @return IUser
+     */
+    public function getUser() {
+        return $this->user;
+    }
 }

apps/federatedfilesharing/appinfo/routes.php

Indentation +14 added lines, -14 removed lines

@@ -23,18 +23,18 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
-		['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
-	],
+    'routes' => [
+        ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
+        ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
+    ],
 ];

apps/dav/appinfo/v2/remote.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 

lib/private/Share20/ProviderFactory.php

Spacing +2 added lines, -2 removed lines

@@ -214,7 +214,7 @@ 
 		}
 
 		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
+			throw new ProviderException('No provider with id .'.$id.' found.');
 		}
 
 		return $provider;
@@ -241,7 +241,7 @@ 
 
 
 		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
+			throw new ProviderException('No share provider for share type '.$shareType);
 		}
 
 		return $provider;

Indentation +261 added lines, -261 removed lines

@@ -48,274 +48,274 @@
  */
 class ProviderFactory implements IProviderFactory {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-	/** @var DefaultShareProvider */
-	private $defaultProvider = null;
-	/** @var FederatedShareProvider */
-	private $federatedProvider = null;
-	/** @var  ShareByMailProvider */
-	private $shareByMailProvider;
-	/** @var  \OCA\Circles\ShareByCircleProvider */
-	private $shareByCircleProvider = null;
-	/** @var bool */
-	private $circlesAreNotAvailable = false;
-	/** @var \OCA\Spreed\Share\RoomShareProvider */
-	private $roomShareProvider = null;
-
-	/**
-	 * IProviderFactory constructor.
-	 *
-	 * @param IServerContainer $serverContainer
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * Create the default share provider.
-	 *
-	 * @return DefaultShareProvider
-	 */
-	protected function defaultShareProvider() {
-		if ($this->defaultProvider === null) {
-			$this->defaultProvider = new DefaultShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getGroupManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->query(Defaults::class),
-				$this->serverContainer->getL10N('sharing'),
-				$this->serverContainer->getURLGenerator()
-			);
-		}
-
-		return $this->defaultProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	protected function federatedShareProvider() {
-		if ($this->federatedProvider === null) {
-			/*
+    /** @var IServerContainer */
+    private $serverContainer;
+    /** @var DefaultShareProvider */
+    private $defaultProvider = null;
+    /** @var FederatedShareProvider */
+    private $federatedProvider = null;
+    /** @var  ShareByMailProvider */
+    private $shareByMailProvider;
+    /** @var  \OCA\Circles\ShareByCircleProvider */
+    private $shareByCircleProvider = null;
+    /** @var bool */
+    private $circlesAreNotAvailable = false;
+    /** @var \OCA\Spreed\Share\RoomShareProvider */
+    private $roomShareProvider = null;
+
+    /**
+     * IProviderFactory constructor.
+     *
+     * @param IServerContainer $serverContainer
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * Create the default share provider.
+     *
+     * @return DefaultShareProvider
+     */
+    protected function defaultShareProvider() {
+        if ($this->defaultProvider === null) {
+            $this->defaultProvider = new DefaultShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getGroupManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->query(Defaults::class),
+                $this->serverContainer->getL10N('sharing'),
+                $this->serverContainer->getURLGenerator()
+            );
+        }
+
+        return $this->defaultProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return FederatedShareProvider
+     */
+    protected function federatedShareProvider() {
+        if ($this->federatedProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('federatedfilesharing')) {
-				return null;
-			}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('federatedfilesharing')) {
+                return null;
+            }
 
-			/*
+            /*
 			 * TODO: add factory to federated sharing app
 			 */
-			$l = $this->serverContainer->getL10N('federatedfilessharing');
-			$addressHandler = new AddressHandler(
-				$this->serverContainer->getURLGenerator(),
-				$l,
-				$this->serverContainer->getCloudIdManager()
-			);
-			$notifications = new Notifications(
-				$addressHandler,
-				$this->serverContainer->getHTTPClientService(),
-				$this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
-				$this->serverContainer->getJobList(),
-				\OC::$server->getCloudFederationProviderManager(),
-				\OC::$server->getCloudFederationFactory()
-			);
-			$tokenHandler = new TokenHandler(
-				$this->serverContainer->getSecureRandom()
-			);
-
-			$this->federatedProvider = new FederatedShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$addressHandler,
-				$notifications,
-				$tokenHandler,
-				$l,
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getConfig(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getCloudIdManager(),
-				$this->serverContainer->getGlobalScaleConfig(),
-				$this->serverContainer->getCloudFederationProviderManager()
-			);
-		}
-
-		return $this->federatedProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return ShareByMailProvider
-	 */
-	protected function getShareByMailProvider() {
-		if ($this->shareByMailProvider === null) {
-			/*
+            $l = $this->serverContainer->getL10N('federatedfilessharing');
+            $addressHandler = new AddressHandler(
+                $this->serverContainer->getURLGenerator(),
+                $l,
+                $this->serverContainer->getCloudIdManager()
+            );
+            $notifications = new Notifications(
+                $addressHandler,
+                $this->serverContainer->getHTTPClientService(),
+                $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
+                $this->serverContainer->getJobList(),
+                \OC::$server->getCloudFederationProviderManager(),
+                \OC::$server->getCloudFederationFactory()
+            );
+            $tokenHandler = new TokenHandler(
+                $this->serverContainer->getSecureRandom()
+            );
+
+            $this->federatedProvider = new FederatedShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $addressHandler,
+                $notifications,
+                $tokenHandler,
+                $l,
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getConfig(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getCloudIdManager(),
+                $this->serverContainer->getGlobalScaleConfig(),
+                $this->serverContainer->getCloudFederationProviderManager()
+            );
+        }
+
+        return $this->federatedProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return ShareByMailProvider
+     */
+    protected function getShareByMailProvider() {
+        if ($this->shareByMailProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('sharebymail')) {
-				return null;
-			}
-
-			$settingsManager = new SettingsManager($this->serverContainer->getConfig());
-
-			$this->shareByMailProvider = new ShareByMailProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('sharebymail'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->getURLGenerator(),
-				$this->serverContainer->getActivityManager(),
-				$settingsManager,
-				$this->serverContainer->query(Defaults::class),
-				$this->serverContainer->getHasher(),
-				$this->serverContainer->query(CapabilitiesManager::class)
-			);
-		}
-
-		return $this->shareByMailProvider;
-	}
-
-
-	/**
-	 * Create the circle share provider
-	 *
-	 * @return FederatedShareProvider
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function getShareByCircleProvider() {
-
-		if ($this->circlesAreNotAvailable) {
-			return null;
-		}
-
-		if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
-			!class_exists('\OCA\Circles\ShareByCircleProvider')
-		) {
-			$this->circlesAreNotAvailable = true;
-			return null;
-		}
-
-		if ($this->shareByCircleProvider === null) {
-
-			$this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('circles'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getURLGenerator()
-			);
-		}
-
-		return $this->shareByCircleProvider;
-	}
-
-	/**
-	 * Create the room share provider
-	 *
-	 * @return RoomShareProvider
-	 */
-	protected function getRoomShareProvider() {
-		if ($this->roomShareProvider === null) {
-			/*
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('sharebymail')) {
+                return null;
+            }
+
+            $settingsManager = new SettingsManager($this->serverContainer->getConfig());
+
+            $this->shareByMailProvider = new ShareByMailProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('sharebymail'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->getURLGenerator(),
+                $this->serverContainer->getActivityManager(),
+                $settingsManager,
+                $this->serverContainer->query(Defaults::class),
+                $this->serverContainer->getHasher(),
+                $this->serverContainer->query(CapabilitiesManager::class)
+            );
+        }
+
+        return $this->shareByMailProvider;
+    }
+
+
+    /**
+     * Create the circle share provider
+     *
+     * @return FederatedShareProvider
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function getShareByCircleProvider() {
+
+        if ($this->circlesAreNotAvailable) {
+            return null;
+        }
+
+        if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
+            !class_exists('\OCA\Circles\ShareByCircleProvider')
+        ) {
+            $this->circlesAreNotAvailable = true;
+            return null;
+        }
+
+        if ($this->shareByCircleProvider === null) {
+
+            $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('circles'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getURLGenerator()
+            );
+        }
+
+        return $this->shareByCircleProvider;
+    }
+
+    /**
+     * Create the room share provider
+     *
+     * @return RoomShareProvider
+     */
+    protected function getRoomShareProvider() {
+        if ($this->roomShareProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('spreed')) {
-				return null;
-			}
-
-			try {
-				$this->roomShareProvider = $this->serverContainer->query('\OCA\Spreed\Share\RoomShareProvider');
-			} catch (\OCP\AppFramework\QueryException $e) {
-				return null;
-			}
-		}
-
-		return $this->roomShareProvider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProvider($id) {
-		$provider = null;
-		if ($id === 'ocinternal') {
-			$provider = $this->defaultShareProvider();
-		} else if ($id === 'ocFederatedSharing') {
-			$provider = $this->federatedShareProvider();
-		} else if ($id === 'ocMailShare') {
-			$provider = $this->getShareByMailProvider();
-		} else if ($id === 'ocCircleShare') {
-			$provider = $this->getShareByCircleProvider();
-		} else if ($id === 'ocRoomShare') {
-			$provider = $this->getRoomShareProvider();
-		}
-
-		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
-		}
-
-		return $provider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProviderForType($shareType) {
-		$provider = null;
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
-			$shareType === \OCP\Share::SHARE_TYPE_GROUP ||
-			$shareType === \OCP\Share::SHARE_TYPE_LINK
-		) {
-			$provider = $this->defaultShareProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE || $shareType === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
-			$provider = $this->federatedShareProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
-			$provider = $this->getShareByMailProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
-			$provider = $this->getShareByCircleProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_ROOM) {
-			$provider = $this->getRoomShareProvider();
-		}
-
-
-		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
-		}
-
-		return $provider;
-	}
-
-	public function getAllProviders() {
-		$shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
-		$shareByMail = $this->getShareByMailProvider();
-		if ($shareByMail !== null) {
-			$shares[] = $shareByMail;
-		}
-		$shareByCircle = $this->getShareByCircleProvider();
-		if ($shareByCircle !== null) {
-			$shares[] = $shareByCircle;
-		}
-		$roomShare = $this->getRoomShareProvider();
-		if ($roomShare !== null) {
-			$shares[] = $roomShare;
-		}
-
-		return $shares;
-	}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('spreed')) {
+                return null;
+            }
+
+            try {
+                $this->roomShareProvider = $this->serverContainer->query('\OCA\Spreed\Share\RoomShareProvider');
+            } catch (\OCP\AppFramework\QueryException $e) {
+                return null;
+            }
+        }
+
+        return $this->roomShareProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProvider($id) {
+        $provider = null;
+        if ($id === 'ocinternal') {
+            $provider = $this->defaultShareProvider();
+        } else if ($id === 'ocFederatedSharing') {
+            $provider = $this->federatedShareProvider();
+        } else if ($id === 'ocMailShare') {
+            $provider = $this->getShareByMailProvider();
+        } else if ($id === 'ocCircleShare') {
+            $provider = $this->getShareByCircleProvider();
+        } else if ($id === 'ocRoomShare') {
+            $provider = $this->getRoomShareProvider();
+        }
+
+        if ($provider === null) {
+            throw new ProviderException('No provider with id .' . $id . ' found.');
+        }
+
+        return $provider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProviderForType($shareType) {
+        $provider = null;
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
+            $shareType === \OCP\Share::SHARE_TYPE_GROUP ||
+            $shareType === \OCP\Share::SHARE_TYPE_LINK
+        ) {
+            $provider = $this->defaultShareProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE || $shareType === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
+            $provider = $this->federatedShareProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
+            $provider = $this->getShareByMailProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
+            $provider = $this->getShareByCircleProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_ROOM) {
+            $provider = $this->getRoomShareProvider();
+        }
+
+
+        if ($provider === null) {
+            throw new ProviderException('No share provider for share type ' . $shareType);
+        }
+
+        return $provider;
+    }
+
+    public function getAllProviders() {
+        $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
+        $shareByMail = $this->getShareByMailProvider();
+        if ($shareByMail !== null) {
+            $shares[] = $shareByMail;
+        }
+        $shareByCircle = $this->getShareByCircleProvider();
+        if ($shareByCircle !== null) {
+            $shares[] = $shareByCircle;
+        }
+        $roomShare = $this->getRoomShareProvider();
+        if ($roomShare !== null) {
+            $shares[] = $roomShare;
+        }
+
+        return $shares;
+    }
 }

apps/systemtags/appinfo/app.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 
-\OCA\Files\App::getNavigationManager()->add(function () {
+\OCA\Files\App::getNavigationManager()->add(function() {
 	$l = \OC::$server->getL10N('systemtags');
 	return [
 		'id' => 'systemtagsfilter',

Indentation +22 added lines, -22 removed lines

@@ -30,19 +30,19 @@ 
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
-	'OCA\Files::loadAdditionalScripts',
-	function() {
-		// FIXME: no public API for these ?
-		\OCP\Util::addScript('dist/systemtags');
-		\OCP\Util::addScript('systemtags', 'systemtags');
-	}
+    'OCA\Files::loadAdditionalScripts',
+    function() {
+        // FIXME: no public API for these ?
+        \OCP\Util::addScript('dist/systemtags');
+        \OCP\Util::addScript('systemtags', 'systemtags');
+    }
 );
 
 $managerListener = function(ManagerEvent $event) {
-	$application = new \OCP\AppFramework\App('systemtags');
-	/** @var \OCA\SystemTags\Activity\Listener $listener */
-	$listener = $application->getContainer()->query(Listener::class);
-	$listener->event($event);
+    $application = new \OCP\AppFramework\App('systemtags');
+    /** @var \OCA\SystemTags\Activity\Listener $listener */
+    $listener = $application->getContainer()->query(Listener::class);
+    $listener->event($event);
 };
 
 $eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener);
@@ -50,23 +50,23 @@ 
 $eventDispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener);
 
 $mapperListener = function(MapperEvent $event) {
-	$application = new \OCP\AppFramework\App('systemtags');
-	/** @var \OCA\SystemTags\Activity\Listener $listener */
-	$listener = $application->getContainer()->query(Listener::class);
-	$listener->mapperEvent($event);
+    $application = new \OCP\AppFramework\App('systemtags');
+    /** @var \OCA\SystemTags\Activity\Listener $listener */
+    $listener = $application->getContainer()->query(Listener::class);
+    $listener->mapperEvent($event);
 };
 
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 
 \OCA\Files\App::getNavigationManager()->add(function () {
-	$l = \OC::$server->getL10N('systemtags');
-	return [
-		'id' => 'systemtagsfilter',
-		'appname' => 'systemtags',
-		'script' => 'list.php',
-		'order' => 25,
-		'name' => $l->t('Tags'),
-	];
+    $l = \OC::$server->getL10N('systemtags');
+    return [
+        'id' => 'systemtagsfilter',
+        'appname' => 'systemtags',
+        'script' => 'list.php',
+        'order' => 25,
+        'name' => $l->t('Tags'),
+    ];
 });
 

apps/files_trashbin/appinfo/app.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 // register hooks
 \OCA\Files_Trashbin\Trashbin::registerHooks();
 
-\OCA\Files\App::getNavigationManager()->add(function () {
+\OCA\Files\App::getNavigationManager()->add(function() {
 	$l = \OC::$server->getL10N('files_trashbin');
 	return [
 		'id' => 'trashbin',

Indentation +9 added lines, -9 removed lines

@@ -29,13 +29,13 @@
 \OCA\Files_Trashbin\Trashbin::registerHooks();
 
 \OCA\Files\App::getNavigationManager()->add(function () {
-	$l = \OC::$server->getL10N('files_trashbin');
-	return [
-		'id' => 'trashbin',
-		'appname' => 'files_trashbin',
-		'script' => 'list.php',
-		'order' => 50,
-		'name' => $l->t('Deleted files'),
-		'classes' => 'pinned',
-	];
+    $l = \OC::$server->getL10N('files_trashbin');
+    return [
+        'id' => 'trashbin',
+        'appname' => 'files_trashbin',
+        'script' => 'list.php',
+        'order' => 50,
+        'name' => $l->t('Deleted files'),
+        'classes' => 'pinned',
+    ];
 });

apps/federation/appinfo/routes.php

Indentation +46 added lines, -46 removed lines

@@ -23,50 +23,50 @@
 $application = new \OCA\Federation\AppInfo\Application();
 
 $application->registerRoutes(
-	$this,
-	[
-		'routes' => [
-			[
-				'name' => 'Settings#addServer',
-				'url' => '/trusted-servers',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'Settings#removeServer',
-				'url' => '/trusted-servers/{id}',
-				'verb' => 'DELETE'
-			],
-			[
-				'name' => 'Settings#autoAddServers',
-				'url' => '/auto-add-servers',
-				'verb' => 'POST'
-			],
-		],
-		'ocs' => [
-			// old endpoints, only used by Nextcloud and ownCloud
-			[
-				'name' => 'OCSAuthAPI#getSharedSecretLegacy',
-				'url' => '/api/v1/shared-secret',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'OCSAuthAPI#requestSharedSecretLegacy',
-				'url' => '/api/v1/request-shared-secret',
-				'verb' => 'POST',
-			],
-			// new endpoints, published as public api
-			[
-				'name' => 'OCSAuthAPI#getSharedSecret',
-				'root' => '/cloud',
-				'url' => '/shared-secret',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'OCSAuthAPI#requestSharedSecret',
-				'root' => '/cloud',
-				'url' => '/shared-secret',
-				'verb' => 'POST',
-			],
-		],
-	]
+    $this,
+    [
+        'routes' => [
+            [
+                'name' => 'Settings#addServer',
+                'url' => '/trusted-servers',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'Settings#removeServer',
+                'url' => '/trusted-servers/{id}',
+                'verb' => 'DELETE'
+            ],
+            [
+                'name' => 'Settings#autoAddServers',
+                'url' => '/auto-add-servers',
+                'verb' => 'POST'
+            ],
+        ],
+        'ocs' => [
+            // old endpoints, only used by Nextcloud and ownCloud
+            [
+                'name' => 'OCSAuthAPI#getSharedSecretLegacy',
+                'url' => '/api/v1/shared-secret',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'OCSAuthAPI#requestSharedSecretLegacy',
+                'url' => '/api/v1/request-shared-secret',
+                'verb' => 'POST',
+            ],
+            // new endpoints, published as public api
+            [
+                'name' => 'OCSAuthAPI#getSharedSecret',
+                'root' => '/cloud',
+                'url' => '/shared-secret',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'OCSAuthAPI#requestSharedSecret',
+                'root' => '/cloud',
+                'url' => '/shared-secret',
+                'verb' => 'POST',
+            ],
+        ],
+    ]
 );