nextcloud / server

apps/twofactor_backupcodes/lib/Db/BackupCode.php

Indentation +6 added lines, -6 removed lines

@@ -34,13 +34,13 @@
  */
 class BackupCode extends Entity {
 
-	/** @var string */
-	protected $userId;
+    /** @var string */
+    protected $userId;
 
-	/** @var string */
-	protected $code;
+    /** @var string */
+    protected $code;
 
-	/** @var int */
-	protected $used;
+    /** @var int */
+    protected $used;
 
 }

apps/encryption/lib/Controller/SettingsController.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 				$encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
 				$header = $this->crypt->generateHeader();
 				if ($encryptedKey) {
-					$this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
+					$this->keyManager->setPrivateKey($uid, $header.$encryptedKey);
 					$this->session->setPrivateKey($decryptedKey);
 					$result = true;
 				}

Indentation +84 added lines, -84 removed lines

@@ -24,95 +24,95 @@
 
 class SettingsController extends Controller {
 
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param KeyManager $keyManager
-	 * @param Crypt $crypt
-	 * @param Session $session
-	 * @param ISession $ocSession
-	 * @param Util $util
-	 */
-	public function __construct(
-		$AppName,
-		IRequest $request,
-		private IL10N $l,
-		private IUserManager $userManager,
-		private IUserSession $userSession,
-		private KeyManager $keyManager,
-		private Crypt $crypt,
-		private Session $session,
-		private ISession $ocSession,
-		private Util $util,
-	) {
-		parent::__construct($AppName, $request);
-	}
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param KeyManager $keyManager
+     * @param Crypt $crypt
+     * @param Session $session
+     * @param ISession $ocSession
+     * @param Util $util
+     */
+    public function __construct(
+        $AppName,
+        IRequest $request,
+        private IL10N $l,
+        private IUserManager $userManager,
+        private IUserSession $userSession,
+        private KeyManager $keyManager,
+        private Crypt $crypt,
+        private Session $session,
+        private ISession $ocSession,
+        private Util $util,
+    ) {
+        parent::__construct($AppName, $request);
+    }
 
 
-	/**
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 * @return DataResponse
-	 */
-	#[NoAdminRequired]
-	#[UseSession]
-	public function updatePrivateKeyPassword($oldPassword, $newPassword) {
-		$result = false;
-		$uid = $this->userSession->getUser()->getUID();
-		$errorMessage = $this->l->t('Could not update the private key password.');
+    /**
+     * @param string $oldPassword
+     * @param string $newPassword
+     * @return DataResponse
+     */
+    #[NoAdminRequired]
+    #[UseSession]
+    public function updatePrivateKeyPassword($oldPassword, $newPassword) {
+        $result = false;
+        $uid = $this->userSession->getUser()->getUID();
+        $errorMessage = $this->l->t('Could not update the private key password.');
 
-		//check if password is correct
-		$passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
-		if ($passwordCorrect === false) {
-			// if check with uid fails we need to check the password with the login name
-			// e.g. in the ldap case. For local user we need to check the password with
-			// the uid because in this case the login name is case insensitive
-			$loginName = $this->ocSession->get('loginname');
-			$passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
-		}
+        //check if password is correct
+        $passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
+        if ($passwordCorrect === false) {
+            // if check with uid fails we need to check the password with the login name
+            // e.g. in the ldap case. For local user we need to check the password with
+            // the uid because in this case the login name is case insensitive
+            $loginName = $this->ocSession->get('loginname');
+            $passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
+        }
 
-		if ($passwordCorrect !== false) {
-			$encryptedKey = $this->keyManager->getPrivateKey($uid);
-			$decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid);
+        if ($passwordCorrect !== false) {
+            $encryptedKey = $this->keyManager->getPrivateKey($uid);
+            $decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid);
 
-			if ($decryptedKey) {
-				$encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
-				$header = $this->crypt->generateHeader();
-				if ($encryptedKey) {
-					$this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
-					$this->session->setPrivateKey($decryptedKey);
-					$result = true;
-				}
-			} else {
-				$errorMessage = $this->l->t('The old password was not correct, please try again.');
-			}
-		} else {
-			$errorMessage = $this->l->t('The current log-in password was not correct, please try again.');
-		}
+            if ($decryptedKey) {
+                $encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
+                $header = $this->crypt->generateHeader();
+                if ($encryptedKey) {
+                    $this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
+                    $this->session->setPrivateKey($decryptedKey);
+                    $result = true;
+                }
+            } else {
+                $errorMessage = $this->l->t('The old password was not correct, please try again.');
+            }
+        } else {
+            $errorMessage = $this->l->t('The current log-in password was not correct, please try again.');
+        }
 
-		if ($result === true) {
-			$this->session->setStatus(Session::INIT_SUCCESSFUL);
-			return new DataResponse(
-				['message' => $this->l->t('Private key password successfully updated.')]
-			);
-		} else {
-			return new DataResponse(
-				['message' => $errorMessage],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-	}
+        if ($result === true) {
+            $this->session->setStatus(Session::INIT_SUCCESSFUL);
+            return new DataResponse(
+                ['message' => $this->l->t('Private key password successfully updated.')]
+            );
+        } else {
+            return new DataResponse(
+                ['message' => $errorMessage],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
+    }
 
-	/**
-	 * @param bool $encryptHomeStorage
-	 * @return DataResponse
-	 */
-	#[UseSession]
-	public function setEncryptHomeStorage($encryptHomeStorage) {
-		$this->util->setEncryptHomeStorage($encryptHomeStorage);
-		return new DataResponse();
-	}
+    /**
+     * @param bool $encryptHomeStorage
+     * @return DataResponse
+     */
+    #[UseSession]
+    public function setEncryptHomeStorage($encryptHomeStorage) {
+        $this->util->setEncryptHomeStorage($encryptHomeStorage);
+        return new DataResponse();
+    }
 }

apps/dav/lib/Connector/LegacyDAVACL.php

Spacing +2 added lines, -2 removed lines

@@ -60,9 +60,9 @@
 
 	public function propFind(PropFind $propFind, INode $node) {
 		/* Overload current-user-principal */
-		$propFind->handle('{DAV:}current-user-principal', function () {
+		$propFind->handle('{DAV:}current-user-principal', function() {
 			if ($url = parent::getCurrentUserPrincipal()) {
-				return new Principal(Principal::HREF, $url . '/');
+				return new Principal(Principal::HREF, $url.'/');
 			} else {
 				return new Principal(Principal::UNAUTHENTICATED);
 			}

Indentation +40 added lines, -40 removed lines

@@ -14,44 +14,44 @@
 
 class LegacyDAVACL extends DavAclPlugin {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getCurrentUserPrincipals() {
-		$principalV2 = $this->getCurrentUserPrincipal();
-
-		if (is_null($principalV2)) {
-			return [];
-		}
-
-		$principalV1 = $this->convertPrincipal($principalV2, false);
-		return array_merge(
-			[
-				$principalV2,
-				$principalV1
-			],
-			$this->getPrincipalMembership($principalV1)
-		);
-	}
-
-	private function convertPrincipal($principal, $toV2) {
-		[, $name] = \Sabre\Uri\split($principal);
-		if ($toV2) {
-			return "principals/users/$name";
-		}
-		return "principals/$name";
-	}
-
-	public function propFind(PropFind $propFind, INode $node) {
-		/* Overload current-user-principal */
-		$propFind->handle('{DAV:}current-user-principal', function () {
-			if ($url = parent::getCurrentUserPrincipal()) {
-				return new Principal(Principal::HREF, $url . '/');
-			} else {
-				return new Principal(Principal::UNAUTHENTICATED);
-			}
-		});
-
-		return parent::propFind($propFind, $node);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getCurrentUserPrincipals() {
+        $principalV2 = $this->getCurrentUserPrincipal();
+
+        if (is_null($principalV2)) {
+            return [];
+        }
+
+        $principalV1 = $this->convertPrincipal($principalV2, false);
+        return array_merge(
+            [
+                $principalV2,
+                $principalV1
+            ],
+            $this->getPrincipalMembership($principalV1)
+        );
+    }
+
+    private function convertPrincipal($principal, $toV2) {
+        [, $name] = \Sabre\Uri\split($principal);
+        if ($toV2) {
+            return "principals/users/$name";
+        }
+        return "principals/$name";
+    }
+
+    public function propFind(PropFind $propFind, INode $node) {
+        /* Overload current-user-principal */
+        $propFind->handle('{DAV:}current-user-principal', function () {
+            if ($url = parent::getCurrentUserPrincipal()) {
+                return new Principal(Principal::HREF, $url . '/');
+            } else {
+                return new Principal(Principal::UNAUTHENTICATED);
+            }
+        });
+
+        return parent::propFind($propFind, $node);
+    }
 }

lib/public/Activity/IConsumer.php

Indentation +7 added lines, -7 removed lines

@@ -38,12 +38,12 @@
  * @since 6.0.0
  */
 interface IConsumer {
-	/**
-	 * @param IEvent $event
-	 * @return null
-	 * @since 6.0.0
-	 * @since 8.2.0 Replaced the parameters with an IEvent object
-	 */
-	public function receive(IEvent $event);
+    /**
+     * @param IEvent $event
+     * @return null
+     * @since 6.0.0
+     * @since 8.2.0 Replaced the parameters with an IEvent object
+     */
+    public function receive(IEvent $event);
 }
 

lib/public/IDateTimeZone.php

Indentation +6 added lines, -6 removed lines

@@ -30,10 +30,10 @@
  * @since 8.0.0
  */
 interface IDateTimeZone {
-	/**
-	 * @param bool|int $timestamp
-	 * @return \DateTimeZone
-	 * @since 8.0.0 - parameter $timestamp was added in 8.1.0
-	 */
-	public function getTimeZone($timestamp = false);
+    /**
+     * @param bool|int $timestamp
+     * @return \DateTimeZone
+     * @since 8.0.0 - parameter $timestamp was added in 8.1.0
+     */
+    public function getTimeZone($timestamp = false);
 }

lib/public/Comments/CommentsEntityEvent.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 */
 	public function addEntityCollection($name, \Closure $entityExistsFunction) {
 		if (isset($this->collections[$name])) {
-			throw new \OutOfBoundsException('Duplicate entity name "' . $name . '"');
+			throw new \OutOfBoundsException('Duplicate entity name "'.$name.'"');
 		}
 
 		$this->collections[$name] = $entityExistsFunction;

Indentation +43 added lines, -43 removed lines

@@ -16,47 +16,47 @@
  * @since 28.0.0 Dispatched as a typed event
  */
 class CommentsEntityEvent extends Event {
-	/**
-	 * @since 9.1.0
-	 * @deprecated 22.0.0 - Listen to the typed event instead.
-	 */
-	public const EVENT_ENTITY = 'OCP\Comments\ICommentsManager::registerEntity';
-
-	/** @var \Closure[] */
-	protected $collections;
-
-	/**
-	 * DispatcherEvent constructor.
-	 *
-	 * @since 9.1.0
-	 */
-	public function __construct() {
-		parent::__construct();
-		$this->collections = [];
-	}
-
-	/**
-	 * @param string $name
-	 * @param \Closure $entityExistsFunction The closure should take one
-	 *                                       argument, which is the id of the entity, that comments
-	 *                                       should be handled for. The return should then be bool,
-	 *                                       depending on whether comments are allowed (true) or not.
-	 * @throws \OutOfBoundsException when the entity name is already taken
-	 * @since 9.1.0
-	 */
-	public function addEntityCollection($name, \Closure $entityExistsFunction) {
-		if (isset($this->collections[$name])) {
-			throw new \OutOfBoundsException('Duplicate entity name "' . $name . '"');
-		}
-
-		$this->collections[$name] = $entityExistsFunction;
-	}
-
-	/**
-	 * @return \Closure[]
-	 * @since 9.1.0
-	 */
-	public function getEntityCollections() {
-		return $this->collections;
-	}
+    /**
+     * @since 9.1.0
+     * @deprecated 22.0.0 - Listen to the typed event instead.
+     */
+    public const EVENT_ENTITY = 'OCP\Comments\ICommentsManager::registerEntity';
+
+    /** @var \Closure[] */
+    protected $collections;
+
+    /**
+     * DispatcherEvent constructor.
+     *
+     * @since 9.1.0
+     */
+    public function __construct() {
+        parent::__construct();
+        $this->collections = [];
+    }
+
+    /**
+     * @param string $name
+     * @param \Closure $entityExistsFunction The closure should take one
+     *                                       argument, which is the id of the entity, that comments
+     *                                       should be handled for. The return should then be bool,
+     *                                       depending on whether comments are allowed (true) or not.
+     * @throws \OutOfBoundsException when the entity name is already taken
+     * @since 9.1.0
+     */
+    public function addEntityCollection($name, \Closure $entityExistsFunction) {
+        if (isset($this->collections[$name])) {
+            throw new \OutOfBoundsException('Duplicate entity name "' . $name . '"');
+        }
+
+        $this->collections[$name] = $entityExistsFunction;
+    }
+
+    /**
+     * @return \Closure[]
+     * @since 9.1.0
+     */
+    public function getEntityCollections() {
+        return $this->collections;
+    }
 }

lib/public/Diagnostics/IEvent.php

Indentation +25 added lines, -25 removed lines

@@ -30,33 +30,33 @@
  * @since 8.0.0
  */
 interface IEvent {
-	/**
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getId();
+    /**
+     * @return string
+     * @since 8.0.0
+     */
+    public function getId();
 
-	/**
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getDescription();
+    /**
+     * @return string
+     * @since 8.0.0
+     */
+    public function getDescription();
 
-	/**
-	 * @return float
-	 * @since 8.0.0
-	 */
-	public function getStart();
+    /**
+     * @return float
+     * @since 8.0.0
+     */
+    public function getStart();
 
-	/**
-	 * @return float
-	 * @since 8.0.0
-	 */
-	public function getEnd();
+    /**
+     * @return float
+     * @since 8.0.0
+     */
+    public function getEnd();
 
-	/**
-	 * @return float
-	 * @since 8.0.0
-	 */
-	public function getDuration();
+    /**
+     * @return float
+     * @since 8.0.0
+     */
+    public function getDuration();
 }

lib/public/Command/ICommand.php

Indentation +5 added lines, -5 removed lines

@@ -30,9 +30,9 @@
  * @since 8.1.0
  */
 interface ICommand {
-	/**
-	 * Run the command
-	 * @since 8.1.0
-	 */
-	public function handle();
+    /**
+     * Run the command
+     * @since 8.1.0
+     */
+    public function handle();
 }

lib/public/Command/IBus.php

Indentation +14 added lines, -14 removed lines

@@ -30,19 +30,19 @@
  * @since 8.1.0
  */
 interface IBus {
-	/**
-	 * Schedule a command to be fired
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 * @since 8.1.0
-	 */
-	public function push($command);
+    /**
+     * Schedule a command to be fired
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     * @since 8.1.0
+     */
+    public function push($command);
 
-	/**
-	 * Require all commands using a trait to be run synchronous
-	 *
-	 * @param string $trait
-	 * @since 8.1.0
-	 */
-	public function requireSync($trait);
+    /**
+     * Require all commands using a trait to be run synchronous
+     *
+     * @param string $trait
+     * @since 8.1.0
+     */
+    public function requireSync($trait);
 }