nextcloud / server

lib/public/FullTextSearch/Service/ISearchService.php

Indentation +37 added lines, -37 removed lines

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

lib/public/FullTextSearch/Model/IIndexOptions.php

Indentation +33 added lines, -33 removed lines

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

lib/private/Authentication/Exceptions/ExpiredTokenException.php

Indentation +9 added lines, -9 removed lines

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

apps/files_versions/lib/Versions/IVersionManager.php

Indentation +8 added lines, -8 removed lines

@@ -25,12 +25,12 @@
  * @since 15.0.0
  */
 interface IVersionManager extends IVersionBackend {
-	/**
-	 * Register a new backend
-	 *
-	 * @param string $storageType
-	 * @param IVersionBackend $backend
-	 * @since 15.0.0
-	 */
-	public function registerBackend(string $storageType, IVersionBackend $backend);
+    /**
+     * Register a new backend
+     *
+     * @param string $storageType
+     * @param IVersionBackend $backend
+     * @since 15.0.0
+     */
+    public function registerBackend(string $storageType, IVersionBackend $backend);
 }

apps/files_versions/lib/Sabre/RootCollection.php

Indentation +40 added lines, -40 removed lines

@@ -33,52 +33,52 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var IVersionManager */
-	private $versionManager;
+    /** @var IVersionManager */
+    private $versionManager;
 
-	public function __construct(
-		PrincipalBackend\BackendInterface $principalBackend,
-		IRootFolder $rootFolder,
-		IConfig $config,
-		IUserManager $userManager,
-		IVersionManager $versionManager
-	) {
-		parent::__construct($principalBackend, 'principals/users');
+    public function __construct(
+        PrincipalBackend\BackendInterface $principalBackend,
+        IRootFolder $rootFolder,
+        IConfig $config,
+        IUserManager $userManager,
+        IVersionManager $versionManager
+    ) {
+        parent::__construct($principalBackend, 'principals/users');
 
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-		$this->versionManager = $versionManager;
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+        $this->versionManager = $versionManager;
 
-		$this->disableListing = !$config->getSystemValue('debug', false);
-	}
+        $this->disableListing = !$config->getSystemValue('debug', false);
+    }
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principalInfo
-	 * @return INode
-	 */
-	public function getChildForPrincipal(array $principalInfo) {
-		list(, $name) = \Sabre\Uri\split($principalInfo['uri']);
-		$user = \OC::$server->getUserSession()->getUser();
-		if (is_null($user) || $name !== $user->getUID()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
-		return new VersionHome($principalInfo, $this->rootFolder, $this->userManager, $this->versionManager);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return INode
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+        list(, $name) = \Sabre\Uri\split($principalInfo['uri']);
+        $user = \OC::$server->getUserSession()->getUser();
+        if (is_null($user) || $name !== $user->getUID()) {
+            throw new \Sabre\DAV\Exception\Forbidden();
+        }
+        return new VersionHome($principalInfo, $this->rootFolder, $this->userManager, $this->versionManager);
+    }
 
-	public function getName() {
-		return 'versions';
-	}
+    public function getName() {
+        return 'versions';
+    }
 
 }

apps/files_versions/lib/Sabre/VersionRoot.php

Indentation +53 added lines, -53 removed lines

@@ -33,74 +33,74 @@
 
 class VersionRoot implements ICollection {
 
-	/** @var IUser */
-	private $user;
+    /** @var IUser */
+    private $user;
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IVersionManager */
-	private $versionManager;
+    /** @var IVersionManager */
+    private $versionManager;
 
-	public function __construct(IUser $user, IRootFolder $rootFolder, IVersionManager $versionManager) {
-		$this->user = $user;
-		$this->rootFolder = $rootFolder;
-		$this->versionManager = $versionManager;
-	}
+    public function __construct(IUser $user, IRootFolder $rootFolder, IVersionManager $versionManager) {
+        $this->user = $user;
+        $this->rootFolder = $rootFolder;
+        $this->versionManager = $versionManager;
+    }
 
-	public function delete() {
-		throw new Forbidden();
-	}
+    public function delete() {
+        throw new Forbidden();
+    }
 
-	public function getName(): string {
-		return 'versions';
-	}
+    public function getName(): string {
+        return 'versions';
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
 
-	public function getChild($name) {
-		$userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
+    public function getChild($name) {
+        $userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
 
-		$fileId = (int)$name;
-		$nodes = $userFolder->getById($fileId);
+        $fileId = (int)$name;
+        $nodes = $userFolder->getById($fileId);
 
-		if ($nodes === []) {
-			throw new NotFound();
-		}
+        if ($nodes === []) {
+            throw new NotFound();
+        }
 
-		$node = array_pop($nodes);
+        $node = array_pop($nodes);
 
-		if (!$node instanceof File) {
-			throw new NotFound();
-		}
+        if (!$node instanceof File) {
+            throw new NotFound();
+        }
 
-		return new VersionCollection($userFolder, $node, $this->user, $this->versionManager);
-	}
+        return new VersionCollection($userFolder, $node, $this->user, $this->versionManager);
+    }
 
-	public function getChildren(): array {
-		return [];
-	}
+    public function getChildren(): array {
+        return [];
+    }
 
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
 
-	public function getLastModified(): int {
-		return 0;
-	}
+    public function getLastModified(): int {
+        return 0;
+    }
 }

apps/files_versions/lib/Sabre/VersionCollection.php

Indentation +72 added lines, -72 removed lines

@@ -35,76 +35,76 @@
 use Sabre\DAV\ICollection;
 
 class VersionCollection implements ICollection {
-	/** @var Folder */
-	private $userFolder;
-
-	/** @var File */
-	private $file;
-
-	/** @var IUser */
-	private $user;
-
-	/** @var IVersionManager */
-	private $versionManager;
-
-	public function __construct(Folder $userFolder, File $file, IUser $user, IVersionManager $versionManager) {
-		$this->userFolder = $userFolder;
-		$this->file = $file;
-		$this->user = $user;
-		$this->versionManager = $versionManager;
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
-
-	public function getChild($name) {
-		/** @var VersionFile[] $versions */
-		$versions = $this->getChildren();
-
-		foreach ($versions as $version) {
-			if ($version->getName() === $name) {
-				return $version;
-			}
-		}
-
-		throw new NotFound();
-	}
-
-	public function getChildren(): array {
-		$versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
-
-		return array_map(function (IVersion $version) {
-			return new VersionFile($version, $this->versionManager);
-		}, $versions);
-	}
-
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function delete() {
-		throw new Forbidden();
-	}
-
-	public function getName(): string {
-		return (string)$this->file->getId();
-	}
-
-	public function setName($name) {
-		throw new Forbidden();
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
+    /** @var Folder */
+    private $userFolder;
+
+    /** @var File */
+    private $file;
+
+    /** @var IUser */
+    private $user;
+
+    /** @var IVersionManager */
+    private $versionManager;
+
+    public function __construct(Folder $userFolder, File $file, IUser $user, IVersionManager $versionManager) {
+        $this->userFolder = $userFolder;
+        $this->file = $file;
+        $this->user = $user;
+        $this->versionManager = $versionManager;
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
+
+    public function getChild($name) {
+        /** @var VersionFile[] $versions */
+        $versions = $this->getChildren();
+
+        foreach ($versions as $version) {
+            if ($version->getName() === $name) {
+                return $version;
+            }
+        }
+
+        throw new NotFound();
+    }
+
+    public function getChildren(): array {
+        $versions = $this->versionManager->getVersionsForFile($this->user, $this->file);
+
+        return array_map(function (IVersion $version) {
+            return new VersionFile($version, $this->versionManager);
+        }, $versions);
+    }
+
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function delete() {
+        throw new Forbidden();
+    }
+
+    public function getName(): string {
+        return (string)$this->file->getId();
+    }
+
+    public function setName($name) {
+        throw new Forbidden();
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
 }

lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php

Indentation +52 added lines, -52 removed lines

@@ -32,60 +32,60 @@
 use OCP\User\Backend\IPasswordConfirmationBackend;
 
 class PasswordConfirmationMiddleware extends Middleware {
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var ISession */
-	private $session;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var array */
-	private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var ISession */
+    private $session;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var array */
+    private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
 
-	/**
-	 * PasswordConfirmationMiddleware constructor.
-	 *
-	 * @param ControllerMethodReflector $reflector
-	 * @param ISession $session
-	 * @param IUserSession $userSession
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(ControllerMethodReflector $reflector,
-								ISession $session,
-								IUserSession $userSession,
-								ITimeFactory $timeFactory) {
-		$this->reflector = $reflector;
-		$this->session = $session;
-		$this->userSession = $userSession;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * PasswordConfirmationMiddleware constructor.
+     *
+     * @param ControllerMethodReflector $reflector
+     * @param ISession $session
+     * @param IUserSession $userSession
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(ControllerMethodReflector $reflector,
+                                ISession $session,
+                                IUserSession $userSession,
+                                ITimeFactory $timeFactory) {
+        $this->reflector = $reflector;
+        $this->session = $session;
+        $this->userSession = $userSession;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws NotConfirmedException
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
-			$user = $this->userSession->getUser();
-			$backendClassName = '';
-			if ($user !== null) {
-				$backend = $user->getBackend();
-				if ($backend instanceof IPasswordConfirmationBackend) {
-					if (!$backend->canConfirmPassword($user->getUID())) {
-						return;
-					}
-				}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws NotConfirmedException
+     */
+    public function beforeController($controller, $methodName) {
+        if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
+            $user = $this->userSession->getUser();
+            $backendClassName = '';
+            if ($user !== null) {
+                $backend = $user->getBackend();
+                if ($backend instanceof IPasswordConfirmationBackend) {
+                    if (!$backend->canConfirmPassword($user->getUID())) {
+                        return;
+                    }
+                }
 
-				$backendClassName = $user->getBackendClassName();
-			}
+                $backendClassName = $user->getBackendClassName();
+            }
 
-			$lastConfirm = (int) $this->session->get('last-password-confirm');
-			// we can't check the password against a SAML backend, so skip password confirmation in this case
-			if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
-				throw new NotConfirmedException();
-			}
-		}
-	}
+            $lastConfirm = (int) $this->session->get('last-password-confirm');
+            // we can't check the password against a SAML backend, so skip password confirmation in this case
+            if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
+                throw new NotConfirmedException();
+            }
+        }
+    }
 }

lib/public/User/Backend/IPasswordConfirmationBackend.php

Indentation +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@
  */
 interface IPasswordConfirmationBackend {
 
-	/**
-	 * @since 15.0.0
-	 */
-	public function canConfirmPassword(string $uid): bool;
+    /**
+     * @since 15.0.0
+     */
+    public function canConfirmPassword(string $uid): bool;
 }