nextcloud / server

apps/user_ldap/lib/Controller/RenewPasswordController.php

Unused Use Statements -1 removed lines

@@ -23,7 +23,6 @@
 namespace OCA\User_LDAP\Controller;
 
 use OC\HintException;
-use OC_Util;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;

Indentation +129 added lines, -129 removed lines

@@ -37,144 +37,144 @@
 use OCP\IUserManager;
 
 class RenewPasswordController extends Controller {
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var ISession */
+    private $session;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	function __construct($appName, IRequest $request, IUserManager $userManager, 
-		IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->l10n = $l10n;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    function __construct($appName, IRequest $request, IUserManager $userManager, 
+        IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->l10n = $l10n;
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return RedirectResponse
-	 */
-	public function cancel() {
-		return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return RedirectResponse
+     */
+    public function cancel() {
+        return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @param string $user
-	 *
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$parameters = [];
-		$renewPasswordMessages = $this->session->get('renewPasswordMessages');
-		$errors = [];
-		$messages = [];
-		if (is_array($renewPasswordMessages)) {
-			list($errors, $messages) = $renewPasswordMessages;
-		}
-		$this->session->remove('renewPasswordMessages');
-		foreach ($errors as $value) {
-			$parameters[$value] = true;
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @param string $user
+     *
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function showRenewPasswordForm($user) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $parameters = [];
+        $renewPasswordMessages = $this->session->get('renewPasswordMessages');
+        $errors = [];
+        $messages = [];
+        if (is_array($renewPasswordMessages)) {
+            list($errors, $messages) = $renewPasswordMessages;
+        }
+        $this->session->remove('renewPasswordMessages');
+        foreach ($errors as $value) {
+            $parameters[$value] = true;
+        }
 
-		$parameters['messages'] = $messages;
-		$parameters['user'] = $user;
+        $parameters['messages'] = $messages;
+        $parameters['user'] = $user;
 
-		$parameters['canResetPassword'] = true;
-		$parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
-		if (!$parameters['resetPasswordLink']) {
-			$userObj = $this->userManager->get($user);
-			if ($userObj instanceof IUser) {
-				$parameters['canResetPassword'] = $userObj->canChangePassword();
-			}
-		}
-		$parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
+        $parameters['canResetPassword'] = true;
+        $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
+        if (!$parameters['resetPasswordLink']) {
+            $userObj = $this->userManager->get($user);
+            if ($userObj instanceof IUser) {
+                $parameters['canResetPassword'] = $userObj->canChangePassword();
+            }
+        }
+        $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
 
-		return new TemplateResponse(
-			$this->appName, 'renewpassword', $parameters, 'guest'
-		);
-	}
+        return new TemplateResponse(
+            $this->appName, 'renewpassword', $parameters, 'guest'
+        );
+    }
 
-	/**
-	 * @PublicPage
-	 * @UseSession
-	 *
-	 * @param string $user
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 *
-	 * @return RedirectResponse
-	 */
-	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$loginResult = $this->userManager->checkPassword($user, $oldPassword);
-		if ($loginResult === false) {
-			$this->session->set('renewPasswordMessages', [
-				['invalidpassword'], []
-			]);
-			return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-		}
+    /**
+     * @PublicPage
+     * @UseSession
+     *
+     * @param string $user
+     * @param string $oldPassword
+     * @param string $newPassword
+     *
+     * @return RedirectResponse
+     */
+    public function tryRenewPassword($user, $oldPassword, $newPassword) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $loginResult = $this->userManager->checkPassword($user, $oldPassword);
+        if ($loginResult === false) {
+            $this->session->set('renewPasswordMessages', [
+                ['invalidpassword'], []
+            ]);
+            return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+        }
 		
-		try {
-			if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
-				$this->session->set('loginMessages', [
-					[], [$this->l10n->t("Please login with the new password")]
-				]);
-				$this->session->remove('needPasswordRenewal');
-				return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-			} else {
-				$this->session->set('renewPasswordMessages', [
-					['internalexception'], []
-				]);
-			}
-		} catch (HintException $e) {
-			$this->session->set('renewPasswordMessages', [
-				[], [$e->getHint()]
-			]);
-		}
+        try {
+            if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
+                $this->session->set('loginMessages', [
+                    [], [$this->l10n->t("Please login with the new password")]
+                ]);
+                $this->session->remove('needPasswordRenewal');
+                return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+            } else {
+                $this->session->set('renewPasswordMessages', [
+                    ['internalexception'], []
+                ]);
+            }
+        } catch (HintException $e) {
+            $this->session->set('renewPasswordMessages', [
+                [], [$e->getHint()]
+            ]);
+        }
 
-		return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-	}
+        return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @return RedirectResponse
-	 */
-	public function showLoginFormInvalidPassword($user) {
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$this->session->set('loginMessages', [
-			['invalidpassword'], []
-		]);
-		return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @return RedirectResponse
+     */
+    public function showLoginFormInvalidPassword($user) {
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $this->session->set('loginMessages', [
+            ['invalidpassword'], []
+        ]);
+        return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return TemplateResponse|RedirectResponse
 	 */
 	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$parameters = [];
@@ -129,7 +129,7 @@ 
 	 * @return RedirectResponse
 	 */
 	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$args = !is_null($user) ? ['user' => $user] : [];

apps/dav/lib/Files/FileSearchBackend.php

Doc Comments +4 added lines

@@ -104,6 +104,10 @@
 		}
 	}
 
+	/**
+	 * @param string $href
+	 * @param string $path
+	 */
 	public function getPropertyDefinitionsForScope($href, $path) {
 		// all valid scopes support the same schema
 

Spacing +8 added lines, -8 removed lines

@@ -155,7 +155,7 @@ 
 		/** @var Folder $folder $results */
 		$results = $folder->search($query);
 
-		return array_map(function (Node $node) {
+		return array_map(function(Node $node) {
 			if ($node instanceof Folder) {
 				return new SearchResult(new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager), $this->getHrefForNode($node));
 			} else {
@@ -169,8 +169,8 @@ 
 	 * @return string
 	 */
 	private function getHrefForNode(Node $node) {
-		$base = '/files/' . $this->user->getUID();
-		return $base . $this->view->getRelativePath($node->getPath());
+		$base = '/files/'.$this->user->getUID();
+		return $base.$this->view->getRelativePath($node->getPath());
 	}
 
 	/**
@@ -210,19 +210,19 @@ 
 			case Operator::OPERATION_LESS_THAN:
 			case Operator::OPERATION_IS_LIKE:
 				if (count($operator->arguments) !== 2) {
-					throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
+					throw new \InvalidArgumentException('Invalid number of arguments for '.$trimmedType.' operation');
 				}
 				if (!is_string($operator->arguments[0])) {
-					throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
+					throw new \InvalidArgumentException('Invalid argument 1 for '.$trimmedType.' operation, expected property');
 				}
 				if (!($operator->arguments[1] instanceof Literal)) {
-					throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
+					throw new \InvalidArgumentException('Invalid argument 2 for '.$trimmedType.' operation, expected literal');
 				}
 				return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value));
 			case Operator::OPERATION_IS_COLLECTION:
 				return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
 			default:
-				throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')');
+				throw new \InvalidArgumentException('Unsupported operation '.$trimmedType.' ('.$operator->type.')');
 		}
 	}
 
@@ -247,7 +247,7 @@ 
 			case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
 				return 'fileid';
 			default:
-				throw new \InvalidArgumentException('Unsupported property for search or order: ' . $propertyName);
+				throw new \InvalidArgumentException('Unsupported property for search or order: '.$propertyName);
 		}
 	}
 

Indentation +207 added lines, -207 removed lines

@@ -49,231 +49,231 @@
 use SearchDAV\XML\Order;
 
 class FileSearchBackend implements ISearchBackend {
-	/** @var Tree */
-	private $tree;
+    /** @var Tree */
+    private $tree;
 
-	/** @var IUser */
-	private $user;
+    /** @var IUser */
+    private $user;
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IManager */
-	private $shareManager;
+    /** @var IManager */
+    private $shareManager;
 
-	/** @var View */
-	private $view;
+    /** @var View */
+    private $view;
 
-	/**
-	 * FileSearchBackend constructor.
-	 *
-	 * @param Tree $tree
-	 * @param IUser $user
-	 * @param IRootFolder $rootFolder
-	 * @param IManager $shareManager
-	 * @param View $view
-	 * @internal param IRootFolder $rootFolder
-	 */
-	public function __construct(Tree $tree, IUser $user, IRootFolder $rootFolder, IManager $shareManager, View $view) {
-		$this->tree = $tree;
-		$this->user = $user;
-		$this->rootFolder = $rootFolder;
-		$this->shareManager = $shareManager;
-		$this->view = $view;
-	}
+    /**
+     * FileSearchBackend constructor.
+     *
+     * @param Tree $tree
+     * @param IUser $user
+     * @param IRootFolder $rootFolder
+     * @param IManager $shareManager
+     * @param View $view
+     * @internal param IRootFolder $rootFolder
+     */
+    public function __construct(Tree $tree, IUser $user, IRootFolder $rootFolder, IManager $shareManager, View $view) {
+        $this->tree = $tree;
+        $this->user = $user;
+        $this->rootFolder = $rootFolder;
+        $this->shareManager = $shareManager;
+        $this->view = $view;
+    }
 
-	/**
-	 * Search endpoint will be remote.php/dav
-	 *
-	 * @return string
-	 */
-	public function getArbiterPath() {
-		return '';
-	}
+    /**
+     * Search endpoint will be remote.php/dav
+     *
+     * @return string
+     */
+    public function getArbiterPath() {
+        return '';
+    }
 
-	public function isValidScope($href, $depth, $path) {
-		// only allow scopes inside the dav server
-		if (is_null($path)) {
-			return false;
-		}
+    public function isValidScope($href, $depth, $path) {
+        // only allow scopes inside the dav server
+        if (is_null($path)) {
+            return false;
+        }
 
-		try {
-			$node = $this->tree->getNodeForPath($path);
-			return $node instanceof Directory;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
+        try {
+            $node = $this->tree->getNodeForPath($path);
+            return $node instanceof Directory;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
 
-	public function getPropertyDefinitionsForScope($href, $path) {
-		// all valid scopes support the same schema
+    public function getPropertyDefinitionsForScope($href, $path) {
+        // all valid scopes support the same schema
 
-		//todo dynamically load all propfind properties that are supported
-		return [
-			// queryable properties
-			new SearchPropertyDefinition('{DAV:}displayname', true, false, true),
-			new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
-			new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
-			new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
-			new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
-			new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+        //todo dynamically load all propfind properties that are supported
+        return [
+            // queryable properties
+            new SearchPropertyDefinition('{DAV:}displayname', true, false, true),
+            new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
+            new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
+            new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+            new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
+            new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
 
-			// select only properties
-			new SearchPropertyDefinition('{DAV:}resourcetype', false, true, false),
-			new SearchPropertyDefinition('{DAV:}getcontentlength', false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, false, true, false),
-			new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_BOOLEAN),
-			new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
-		];
-	}
+            // select only properties
+            new SearchPropertyDefinition('{DAV:}resourcetype', false, true, false),
+            new SearchPropertyDefinition('{DAV:}getcontentlength', false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, false, true, false),
+            new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_BOOLEAN),
+            new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+        ];
+    }
 
-	/**
-	 * @param BasicSearch $search
-	 * @return SearchResult[]
-	 */
-	public function search(BasicSearch $search) {
-		if (count($search->from) !== 1) {
-			throw new \InvalidArgumentException('Searching more than one folder is not supported');
-		}
-		$query = $this->transformQuery($search);
-		$scope = $search->from[0];
-		if ($scope->path === null) {
-			throw new \InvalidArgumentException('Using uri\'s as scope is not supported, please use a path relative to the search arbiter instead');
-		}
-		$node = $this->tree->getNodeForPath($scope->path);
-		if (!$node instanceof Directory) {
-			throw new \InvalidArgumentException('Search is only supported on directories');
-		}
+    /**
+     * @param BasicSearch $search
+     * @return SearchResult[]
+     */
+    public function search(BasicSearch $search) {
+        if (count($search->from) !== 1) {
+            throw new \InvalidArgumentException('Searching more than one folder is not supported');
+        }
+        $query = $this->transformQuery($search);
+        $scope = $search->from[0];
+        if ($scope->path === null) {
+            throw new \InvalidArgumentException('Using uri\'s as scope is not supported, please use a path relative to the search arbiter instead');
+        }
+        $node = $this->tree->getNodeForPath($scope->path);
+        if (!$node instanceof Directory) {
+            throw new \InvalidArgumentException('Search is only supported on directories');
+        }
 
-		$fileInfo = $node->getFileInfo();
-		$folder = $this->rootFolder->get($fileInfo->getPath());
-		/** @var Folder $folder $results */
-		$results = $folder->search($query);
+        $fileInfo = $node->getFileInfo();
+        $folder = $this->rootFolder->get($fileInfo->getPath());
+        /** @var Folder $folder $results */
+        $results = $folder->search($query);
 
-		return array_map(function (Node $node) {
-			if ($node instanceof Folder) {
-				return new SearchResult(new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager), $this->getHrefForNode($node));
-			} else {
-				return new SearchResult(new \OCA\DAV\Connector\Sabre\File($this->view, $node, $this->shareManager), $this->getHrefForNode($node));
-			}
-		}, $results);
-	}
+        return array_map(function (Node $node) {
+            if ($node instanceof Folder) {
+                return new SearchResult(new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager), $this->getHrefForNode($node));
+            } else {
+                return new SearchResult(new \OCA\DAV\Connector\Sabre\File($this->view, $node, $this->shareManager), $this->getHrefForNode($node));
+            }
+        }, $results);
+    }
 
-	/**
-	 * @param Node $node
-	 * @return string
-	 */
-	private function getHrefForNode(Node $node) {
-		$base = '/files/' . $this->user->getUID();
-		return $base . $this->view->getRelativePath($node->getPath());
-	}
+    /**
+     * @param Node $node
+     * @return string
+     */
+    private function getHrefForNode(Node $node) {
+        $base = '/files/' . $this->user->getUID();
+        return $base . $this->view->getRelativePath($node->getPath());
+    }
 
-	/**
-	 * @param BasicSearch $query
-	 * @return ISearchQuery
-	 */
-	private function transformQuery(BasicSearch $query) {
-		// TODO offset, limit
-		$orders = array_map([$this, 'mapSearchOrder'], $query->orderBy);
-		return new SearchQuery($this->transformSearchOperation($query->where), 0, 0, $orders, $this->user);
-	}
+    /**
+     * @param BasicSearch $query
+     * @return ISearchQuery
+     */
+    private function transformQuery(BasicSearch $query) {
+        // TODO offset, limit
+        $orders = array_map([$this, 'mapSearchOrder'], $query->orderBy);
+        return new SearchQuery($this->transformSearchOperation($query->where), 0, 0, $orders, $this->user);
+    }
 
-	/**
-	 * @param Order $order
-	 * @return ISearchOrder
-	 */
-	private function mapSearchOrder(Order $order) {
-		return new SearchOrder($order->order === Order::ASC ? ISearchOrder::DIRECTION_ASCENDING : ISearchOrder::DIRECTION_DESCENDING, $this->mapPropertyNameToColumn($order->property));
-	}
+    /**
+     * @param Order $order
+     * @return ISearchOrder
+     */
+    private function mapSearchOrder(Order $order) {
+        return new SearchOrder($order->order === Order::ASC ? ISearchOrder::DIRECTION_ASCENDING : ISearchOrder::DIRECTION_DESCENDING, $this->mapPropertyNameToColumn($order->property));
+    }
 
-	/**
-	 * @param Operator $operator
-	 * @return ISearchOperator
-	 */
-	private function transformSearchOperation(Operator $operator) {
-		list(, $trimmedType) = explode('}', $operator->type);
-		switch ($operator->type) {
-			case Operator::OPERATION_AND:
-			case Operator::OPERATION_OR:
-			case Operator::OPERATION_NOT:
-				$arguments = array_map([$this, 'transformSearchOperation'], $operator->arguments);
-				return new SearchBinaryOperator($trimmedType, $arguments);
-			case Operator::OPERATION_EQUAL:
-			case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
-			case Operator::OPERATION_GREATER_THAN:
-			case Operator::OPERATION_LESS_OR_EQUAL_THAN:
-			case Operator::OPERATION_LESS_THAN:
-			case Operator::OPERATION_IS_LIKE:
-				if (count($operator->arguments) !== 2) {
-					throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
-				}
-				if (!is_string($operator->arguments[0])) {
-					throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
-				}
-				if (!($operator->arguments[1] instanceof Literal)) {
-					throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
-				}
-				return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value));
-			case Operator::OPERATION_IS_COLLECTION:
-				return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
-			default:
-				throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')');
-		}
-	}
+    /**
+     * @param Operator $operator
+     * @return ISearchOperator
+     */
+    private function transformSearchOperation(Operator $operator) {
+        list(, $trimmedType) = explode('}', $operator->type);
+        switch ($operator->type) {
+            case Operator::OPERATION_AND:
+            case Operator::OPERATION_OR:
+            case Operator::OPERATION_NOT:
+                $arguments = array_map([$this, 'transformSearchOperation'], $operator->arguments);
+                return new SearchBinaryOperator($trimmedType, $arguments);
+            case Operator::OPERATION_EQUAL:
+            case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
+            case Operator::OPERATION_GREATER_THAN:
+            case Operator::OPERATION_LESS_OR_EQUAL_THAN:
+            case Operator::OPERATION_LESS_THAN:
+            case Operator::OPERATION_IS_LIKE:
+                if (count($operator->arguments) !== 2) {
+                    throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
+                }
+                if (!is_string($operator->arguments[0])) {
+                    throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
+                }
+                if (!($operator->arguments[1] instanceof Literal)) {
+                    throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
+                }
+                return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value));
+            case Operator::OPERATION_IS_COLLECTION:
+                return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
+            default:
+                throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')');
+        }
+    }
 
-	/**
-	 * @param string $propertyName
-	 * @return string
-	 */
-	private function mapPropertyNameToColumn($propertyName) {
-		switch ($propertyName) {
-			case '{DAV:}displayname':
-				return 'name';
-			case '{DAV:}getcontenttype':
-				return 'mimetype';
-			case '{DAV:}getlastmodified':
-				return 'mtime';
-			case FilesPlugin::SIZE_PROPERTYNAME:
-				return 'size';
-			case TagsPlugin::FAVORITE_PROPERTYNAME:
-				return 'favorite';
-			case TagsPlugin::TAGS_PROPERTYNAME:
-				return 'tagname';
-			case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
-				return 'fileid';
-			default:
-				throw new \InvalidArgumentException('Unsupported property for search or order: ' . $propertyName);
-		}
-	}
+    /**
+     * @param string $propertyName
+     * @return string
+     */
+    private function mapPropertyNameToColumn($propertyName) {
+        switch ($propertyName) {
+            case '{DAV:}displayname':
+                return 'name';
+            case '{DAV:}getcontenttype':
+                return 'mimetype';
+            case '{DAV:}getlastmodified':
+                return 'mtime';
+            case FilesPlugin::SIZE_PROPERTYNAME:
+                return 'size';
+            case TagsPlugin::FAVORITE_PROPERTYNAME:
+                return 'favorite';
+            case TagsPlugin::TAGS_PROPERTYNAME:
+                return 'tagname';
+            case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
+                return 'fileid';
+            default:
+                throw new \InvalidArgumentException('Unsupported property for search or order: ' . $propertyName);
+        }
+    }
 
-	private function castValue($propertyName, $value) {
-		$allProps = $this->getPropertyDefinitionsForScope('', '');
-		foreach ($allProps as $prop) {
-			if ($prop->name === $propertyName) {
-				$dataType = $prop->dataType;
-				switch ($dataType) {
-					case SearchPropertyDefinition::DATATYPE_BOOLEAN:
-						return $value === 'yes';
-					case SearchPropertyDefinition::DATATYPE_DECIMAL:
-					case SearchPropertyDefinition::DATATYPE_INTEGER:
-					case SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER:
-						return 0 + $value;
-					case SearchPropertyDefinition::DATATYPE_DATETIME:
-						if (is_numeric($value)) {
-							return 0 + $value;
-						}
-						$date = \DateTime::createFromFormat(\DateTime::ATOM, $value);
-						return ($date instanceof \DateTime) ? $date->getTimestamp() : 0;
-					default:
-						return $value;
-				}
-			}
-		}
-		return $value;
-	}
+    private function castValue($propertyName, $value) {
+        $allProps = $this->getPropertyDefinitionsForScope('', '');
+        foreach ($allProps as $prop) {
+            if ($prop->name === $propertyName) {
+                $dataType = $prop->dataType;
+                switch ($dataType) {
+                    case SearchPropertyDefinition::DATATYPE_BOOLEAN:
+                        return $value === 'yes';
+                    case SearchPropertyDefinition::DATATYPE_DECIMAL:
+                    case SearchPropertyDefinition::DATATYPE_INTEGER:
+                    case SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER:
+                        return 0 + $value;
+                    case SearchPropertyDefinition::DATATYPE_DATETIME:
+                        if (is_numeric($value)) {
+                            return 0 + $value;
+                        }
+                        $date = \DateTime::createFromFormat(\DateTime::ATOM, $value);
+                        return ($date instanceof \DateTime) ? $date->getTimestamp() : 0;
+                    default:
+                        return $value;
+                }
+            }
+        }
+        return $value;
+    }
 }

lib/public/AppFramework/Http/StreamResponse.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	private $filePath;
 
 	/**
-	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
+	 * @param string $filePath the path to the file or a file handle which should be streamed
 	 * @since 8.1.0
 	 */
 	public function __construct ($filePath) {

Indentation +25 added lines, -25 removed lines

@@ -33,33 +33,33 @@
  * @since 8.1.0
  */
 class StreamResponse extends Response implements ICallbackResponse {
-	/** @var string */
-	private $filePath;
+    /** @var string */
+    private $filePath;
 
-	/**
-	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
-	 * @since 8.1.0
-	 */
-	public function __construct ($filePath) {
-		$this->filePath = $filePath;
-	}
+    /**
+     * @param string|resource $filePath the path to the file or a file handle which should be streamed
+     * @since 8.1.0
+     */
+    public function __construct ($filePath) {
+        $this->filePath = $filePath;
+    }
 
 
-	/**
-	 * Streams the file using readfile
-	 *
-	 * @param IOutput $output a small wrapper that handles output
-	 * @since 8.1.0
-	 */
-	public function callback (IOutput $output) {
-		// handle caching
-		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
-				$output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
-			} elseif ($output->setReadfile($this->filePath) === false) {
-				$output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
-			}
-		}
-	}
+    /**
+     * Streams the file using readfile
+     *
+     * @param IOutput $output a small wrapper that handles output
+     * @since 8.1.0
+     */
+    public function callback (IOutput $output) {
+        // handle caching
+        if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
+            if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
+                $output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
+            } elseif ($output->setReadfile($this->filePath) === false) {
+                $output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
+            }
+        }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
 	 * @since 8.1.0
 	 */
-	public function __construct ($filePath) {
+	public function __construct($filePath) {
 		$this->filePath = $filePath;
 	}
 
@@ -51,7 +51,7 @@ 
 	 * @param IOutput $output a small wrapper that handles output
 	 * @since 8.1.0
 	 */
-	public function callback (IOutput $output) {
+	public function callback(IOutput $output) {
 		// handle caching
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
 			if (!(is_resource($this->filePath) || file_exists($this->filePath))) {

apps/dav/lib/Connector/Sabre/DavAclPlugin.php

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
 		$this->allowUnauthenticatedAccess = false;
 	}
 
+	/**
+	 * @param string $privileges
+	 */
 	function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
 		$access = parent::checkPrivileges($uri, $privileges, $recursion, false);
 		if($access === false && $throwExceptions) {

Indentation +41 added lines, -41 removed lines

@@ -43,50 +43,50 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class DavAclPlugin extends \Sabre\DAVACL\Plugin {
-	public function __construct() {
-		$this->hideNodesFromListings = true;
-		$this->allowUnauthenticatedAccess = false;
-	}
+    public function __construct() {
+        $this->hideNodesFromListings = true;
+        $this->allowUnauthenticatedAccess = false;
+    }
 
-	function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
-		$access = parent::checkPrivileges($uri, $privileges, $recursion, false);
-		if($access === false && $throwExceptions) {
-			/** @var INode $node */
-			$node = $this->server->tree->getNodeForPath($uri);
+    function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
+        $access = parent::checkPrivileges($uri, $privileges, $recursion, false);
+        if($access === false && $throwExceptions) {
+            /** @var INode $node */
+            $node = $this->server->tree->getNodeForPath($uri);
 
-			switch(get_class($node)) {
-				case 'OCA\DAV\CardDAV\AddressBook':
-					$type = 'Addressbook';
-					break;
-				default:
-					$type = 'Node';
-					break;
-			}
-			throw new NotFound(
-				sprintf(
-					"%s with name '%s' could not be found",
-					$type,
-					$node->getName()
-				)
-			);
-		}
+            switch(get_class($node)) {
+                case 'OCA\DAV\CardDAV\AddressBook':
+                    $type = 'Addressbook';
+                    break;
+                default:
+                    $type = 'Node';
+                    break;
+            }
+            throw new NotFound(
+                sprintf(
+                    "%s with name '%s' could not be found",
+                    $type,
+                    $node->getName()
+                )
+            );
+        }
 
-		return $access;
-	}
+        return $access;
+    }
 
-	public function propFind(PropFind $propFind, INode $node) {
-		// If the node is neither readable nor writable then fail unless its of
-		// the standard user-principal
-		if(!($node instanceof User)) {
-			$path = $propFind->getPath();
-			$readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false);
-			$writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false);
-			if ($readPermissions === false && $writePermissions === false) {
-				$this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, true);
-				$this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, true);
-			}
-		}
+    public function propFind(PropFind $propFind, INode $node) {
+        // If the node is neither readable nor writable then fail unless its of
+        // the standard user-principal
+        if(!($node instanceof User)) {
+            $path = $propFind->getPath();
+            $readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false);
+            $writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false);
+            if ($readPermissions === false && $writePermissions === false) {
+                $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, true);
+                $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, true);
+            }
+        }
 
-		return parent::propFind($propFind, $node);
-	}
+        return parent::propFind($propFind, $node);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -50,11 +50,11 @@ 
 
 	function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
 		$access = parent::checkPrivileges($uri, $privileges, $recursion, false);
-		if($access === false && $throwExceptions) {
+		if ($access === false && $throwExceptions) {
 			/** @var INode $node */
 			$node = $this->server->tree->getNodeForPath($uri);
 
-			switch(get_class($node)) {
+			switch (get_class($node)) {
 				case 'OCA\DAV\CardDAV\AddressBook':
 					$type = 'Addressbook';
 					break;
@@ -77,7 +77,7 @@ 
 	public function propFind(PropFind $propFind, INode $node) {
 		// If the node is neither readable nor writable then fail unless its of
 		// the standard user-principal
-		if(!($node instanceof User)) {
+		if (!($node instanceof User)) {
 			$path = $propFind->getPath();
 			$readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false);
 			$writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false);

lib/private/Files/Storage/Storage.php

Doc Comments +3 added lines

@@ -100,6 +100,7 @@ 
 	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 * @throws \OCP\Lock\LockedException
+	 * @return void
 	 */
 	public function acquireLock($path, $type, ILockingProvider $provider);
 
@@ -108,6 +109,7 @@ 
 	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 * @throws \OCP\Lock\LockedException
+	 * @return void
 	 */
 	public function releaseLock($path, $type, ILockingProvider $provider);
 
@@ -116,6 +118,7 @@ 
 	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 * @throws \OCP\Lock\LockedException
+	 * @return void
 	 */
 	public function changeLock($path, $type, ILockingProvider $provider);
 }

Indentation +75 added lines, -75 removed lines

@@ -32,90 +32,90 @@
  */
 interface Storage extends \OCP\Files\Storage {
 
-	/**
-	 * get a cache instance for the storage
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
-	 * @return \OC\Files\Cache\Cache
-	 */
-	public function getCache($path = '', $storage = null);
+    /**
+     * get a cache instance for the storage
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+     * @return \OC\Files\Cache\Cache
+     */
+    public function getCache($path = '', $storage = null);
 
-	/**
-	 * get a scanner instance for the storage
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
-	 * @return \OC\Files\Cache\Scanner
-	 */
-	public function getScanner($path = '', $storage = null);
+    /**
+     * get a scanner instance for the storage
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
+     * @return \OC\Files\Cache\Scanner
+     */
+    public function getScanner($path = '', $storage = null);
 
 
-	/**
-	 * get the user id of the owner of a file or folder
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getOwner($path);
+    /**
+     * get the user id of the owner of a file or folder
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getOwner($path);
 
-	/**
-	 * get a watcher instance for the cache
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Watcher
-	 */
-	public function getWatcher($path = '', $storage = null);
+    /**
+     * get a watcher instance for the cache
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Watcher
+     */
+    public function getWatcher($path = '', $storage = null);
 
-	/**
-	 * get a propagator instance for the cache
-	 *
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Propagator
-	 */
-	public function getPropagator($storage = null);
+    /**
+     * get a propagator instance for the cache
+     *
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Propagator
+     */
+    public function getPropagator($storage = null);
 
-	/**
-	 * get a updater instance for the cache
-	 *
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Updater
-	 */
-	public function getUpdater($storage = null);
+    /**
+     * get a updater instance for the cache
+     *
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Updater
+     */
+    public function getUpdater($storage = null);
 
-	/**
-	 * @return \OC\Files\Cache\Storage
-	 */
-	public function getStorageCache();
+    /**
+     * @return \OC\Files\Cache\Storage
+     */
+    public function getStorageCache();
 
-	/**
-	 * @param string $path
-	 * @return array
-	 */
-	public function getMetaData($path);
+    /**
+     * @param string $path
+     * @return array
+     */
+    public function getMetaData($path);
 
-	/**
-	 * @param string $path The path of the file to acquire the lock for
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param \OCP\Lock\ILockingProvider $provider
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function acquireLock($path, $type, ILockingProvider $provider);
+    /**
+     * @param string $path The path of the file to acquire the lock for
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param \OCP\Lock\ILockingProvider $provider
+     * @throws \OCP\Lock\LockedException
+     */
+    public function acquireLock($path, $type, ILockingProvider $provider);
 
-	/**
-	 * @param string $path The path of the file to release the lock for
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param \OCP\Lock\ILockingProvider $provider
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function releaseLock($path, $type, ILockingProvider $provider);
+    /**
+     * @param string $path The path of the file to release the lock for
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param \OCP\Lock\ILockingProvider $provider
+     * @throws \OCP\Lock\LockedException
+     */
+    public function releaseLock($path, $type, ILockingProvider $provider);
 
-	/**
-	 * @param string $path The path of the file to change the lock for
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @param \OCP\Lock\ILockingProvider $provider
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function changeLock($path, $type, ILockingProvider $provider);
+    /**
+     * @param string $path The path of the file to change the lock for
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @param \OCP\Lock\ILockingProvider $provider
+     * @throws \OCP\Lock\LockedException
+     */
+    public function changeLock($path, $type, ILockingProvider $provider);
 }

apps/files/templates/admin.php

Spacing +6 added lines, -6 removed lines

@@ -2,17 +2,17 @@
 
 	<div class="section">
 		<h2><?php p($l->t('File handling')); ?></h2>
-		<label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label>
+		<label for="maxUploadSize"><?php p($l->t('Maximum upload size')); ?> </label>
 		<span id="maxUploadSizeSettingsMsg" class="msg"></span>
 		<br />
-		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> />
-		<?php if($_['displayMaxPossibleUploadSize']):?>
+		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if (!$_['uploadChangable']) { p('disabled'); } ?> />
+		<?php if ($_['displayMaxPossibleUploadSize']):?>
 			(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>)
-		<?php endif;?>
+		<?php endif; ?>
 		<input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />
-		<?php if($_['uploadChangable']): ?>
+		<?php if ($_['uploadChangable']): ?>
 			<input type="submit" id="submitMaxUpload"
-				   value="<?php p($l->t( 'Save' )); ?>"/>
+				   value="<?php p($l->t('Save')); ?>"/>
 			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p>
 		<?php else: ?>
 			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p>

Braces +5 added lines, -2 removed lines

@@ -14,7 +14,10 @@
 			<input type="submit" id="submitMaxUpload"
 				   value="<?php p($l->t( 'Save' )); ?>"/>
 			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p>
-		<?php else: ?>
-			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p>
+		<?php else {
+    : ?>
+			<p><em><?php p($l->t('Missing permissions to edit from here.'));
+}
+?></em></p>
 		<?php endif; ?>
 	</div>

apps/files/templates/list.php

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 		<div class="actions creatable hidden">
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar">
-					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...'));?></span><span class="mobile"><?php p($l->t('...'));?></span></em>
+					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...')); ?></span><span class="mobile"><?php p($l->t('...')); ?></span></em>
 				</div>
 				<input type="button" class="stop icon-close" style="display:none" value="" />
 			</div>
@@ -16,10 +16,10 @@ 
 	*/ ?>
 	<input type="hidden" name="permissions" value="" id="permissions">
 	<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
-	<?php if(isset($_['dirToken'])):?>
+	<?php if (isset($_['dirToken'])):?>
 	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
 	<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
-	<?php endif;?>
+	<?php endif; ?>
 	<input type="hidden" class="max_human_file_size"
 		   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
 </div>
@@ -45,7 +45,7 @@ 
 					<label for="select_all_files">
 						<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
 					</label>
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 					<span id="selectedActionsList" class="selectedActions">
 						<a href="" class="download">
 							<span class="icon icon-download"></span>
@@ -58,7 +58,7 @@ 
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 					<span class="selectedActions"><a href="" class="delete-selected">
 						<span><?php p($l->t('Delete'))?></span>
 						<span class="icon icon-delete"></span>
@@ -78,6 +78,6 @@ 
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
 	<p>
-	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
+	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.')); ?>
 	</p>
 </div>

apps/files/templates/simplelist.php

Spacing +2 added lines, -2 removed lines

@@ -19,14 +19,14 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerSize" class="hidden column-size">
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 					<span class="selectedActions"><a href="" class="delete-selected">
 						<?php p($l->t('Delete'))?>
 						<img class="svg" alt="<?php p($l->t('Delete'))?>"

apps/files/ajax/getstoragestats.php

Indentation +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 $dir = '/';
 
 if (isset($_GET['dir'])) {
-	$dir = (string)$_GET['dir'];
+    $dir = (string)$_GET['dir'];
 }
 
 OCP\JSON::checkLoggedIn();
@@ -34,7 +34,7 @@ 
 
 // send back json
 try {
-	OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir)));
+    OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir)));
 } catch (\OCP\Files\NotFoundException $e) {
-	OCP\JSON::error(['data' => ['message' => 'Folder not found']]);
+    OCP\JSON::error(['data' => ['message' => 'Folder not found']]);
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 $dir = '/';
 
 if (isset($_GET['dir'])) {
-	$dir = (string)$_GET['dir'];
+	$dir = (string) $_GET['dir'];
 }
 
 OCP\JSON::checkLoggedIn();