nextcloud / server

apps/files_external/lib/Lib/Auth/NullMechanism.php

Indentation +7 added lines, -7 removed lines

@@ -28,11 +28,11 @@
  * Null authentication mechanism
  */
 class NullMechanism extends AuthMechanism {
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('null::null')
-			->setScheme(self::SCHEME_NULL)
-			->setText($l->t('None'))
-		;
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('null::null')
+            ->setScheme(self::SCHEME_NULL)
+            ->setText($l->t('None'))
+        ;
+    }
 }

apps/comments/lib/Notification/Listener.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		$notification
 			->setApp('comments')
 			->setObject('comment', $comment->getId())
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
+			->setSubject('mention', [$comment->getObjectType(), $comment->getObjectId()])
 			->setDateTime($comment->getCreationDateTime());
 
 		return $notification;

Indentation +59 added lines, -59 removed lines

@@ -14,71 +14,71 @@
 use OCP\Notification\INotification;
 
 class Listener {
-	public function __construct(
-		protected IManager $notificationManager,
-		protected IUserManager $userManager,
-	) {
-	}
+    public function __construct(
+        protected IManager $notificationManager,
+        protected IUserManager $userManager,
+    ) {
+    }
 
-	public function evaluate(CommentsEvent $event): void {
-		$comment = $event->getComment();
+    public function evaluate(CommentsEvent $event): void {
+        $comment = $event->getComment();
 
-		$mentions = $this->extractMentions($comment->getMentions());
-		if (empty($mentions)) {
-			// no one to notify
-			return;
-		}
+        $mentions = $this->extractMentions($comment->getMentions());
+        if (empty($mentions)) {
+            // no one to notify
+            return;
+        }
 
-		$notification = $this->instantiateNotification($comment);
+        $notification = $this->instantiateNotification($comment);
 
-		foreach ($mentions as $uid) {
-			if (($comment->getActorType() === 'users' && $uid === $comment->getActorId())
-				|| !$this->userManager->userExists($uid)
-			) {
-				// do not notify unknown users or yourself
-				continue;
-			}
+        foreach ($mentions as $uid) {
+            if (($comment->getActorType() === 'users' && $uid === $comment->getActorId())
+                || !$this->userManager->userExists($uid)
+            ) {
+                // do not notify unknown users or yourself
+                continue;
+            }
 
-			$notification->setUser($uid);
-			if ($event->getEvent() === CommentsEvent::EVENT_DELETE
-				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE) {
-				$this->notificationManager->markProcessed($notification);
-			} else {
-				$this->notificationManager->notify($notification);
-			}
-		}
-	}
+            $notification->setUser($uid);
+            if ($event->getEvent() === CommentsEvent::EVENT_DELETE
+                || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE) {
+                $this->notificationManager->markProcessed($notification);
+            } else {
+                $this->notificationManager->notify($notification);
+            }
+        }
+    }
 
-	/**
-	 * Creates a notification instance and fills it with comment data
-	 */
-	public function instantiateNotification(IComment $comment): INotification {
-		$notification = $this->notificationManager->createNotification();
-		$notification
-			->setApp('comments')
-			->setObject('comment', $comment->getId())
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
-			->setDateTime($comment->getCreationDateTime());
+    /**
+     * Creates a notification instance and fills it with comment data
+     */
+    public function instantiateNotification(IComment $comment): INotification {
+        $notification = $this->notificationManager->createNotification();
+        $notification
+            ->setApp('comments')
+            ->setObject('comment', $comment->getId())
+            ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
+            ->setDateTime($comment->getCreationDateTime());
 
-		return $notification;
-	}
+        return $notification;
+    }
 
-	/**
-	 * Flattens the mention array returned from comments to a list of user ids.
-	 *
-	 * @param array $mentions
-	 * @return list<string> containing the mentions, e.g. ['alice', 'bob']
-	 */
-	public function extractMentions(array $mentions): array {
-		if (empty($mentions)) {
-			return [];
-		}
-		$uids = [];
-		foreach ($mentions as $mention) {
-			if ($mention['type'] === 'user') {
-				$uids[] = $mention['id'];
-			}
-		}
-		return $uids;
-	}
+    /**
+     * Flattens the mention array returned from comments to a list of user ids.
+     *
+     * @param array $mentions
+     * @return list<string> containing the mentions, e.g. ['alice', 'bob']
+     */
+    public function extractMentions(array $mentions): array {
+        if (empty($mentions)) {
+            return [];
+        }
+        $uids = [];
+        foreach ($mentions as $mention) {
+            if ($mention['type'] === 'user') {
+                $uids[] = $mention['id'];
+            }
+        }
+        return $uids;
+    }
 }

apps/workflowengine/lib/Check/RequestURL.php

Spacing +4 added lines, -4 removed lines

@@ -69,10 +69,10 @@
 			return $this->url;
 		}
 
-		$this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
-		$this->url .= $this->request->getServerHost();// E.g. localhost
-		$this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
-		$this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
+		$this->url = $this->request->getServerProtocol().'://'; // E.g. http(s) + ://
+		$this->url .= $this->request->getServerHost(); // E.g. localhost
+		$this->url .= $this->request->getScriptName(); // E.g. /nextcloud/index.php
+		$this->url .= $this->request->getPathInfo(); // E.g. /apps/files_texteditor/ajax/loadfile
 
 		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
 	}

Indentation +60 added lines, -60 removed lines

@@ -10,71 +10,71 @@
 use OCP\IRequest;
 
 class RequestURL extends AbstractStringCheck {
-	public const CLI = 'cli';
+    public const CLI = 'cli';
 
-	/** @var ?string */
-	protected $url;
+    /** @var ?string */
+    protected $url;
 
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 */
-	public function __construct(
-		IL10N $l,
-		protected IRequest $request,
-	) {
-		parent::__construct($l);
-	}
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     */
+    public function __construct(
+        IL10N $l,
+        protected IRequest $request,
+    ) {
+        parent::__construct($l);
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		if (\OC::$CLI) {
-			$actualValue = $this->url = RequestURL::CLI;
-		} else {
-			$actualValue = $this->getActualValue();
-		}
-		if (in_array($operator, ['is', '!is'])) {
-			switch ($value) {
-				case 'webdav':
-					if ($operator === 'is') {
-						return $this->isWebDAVRequest();
-					} else {
-						return !$this->isWebDAVRequest();
-					}
-			}
-		}
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        if (\OC::$CLI) {
+            $actualValue = $this->url = RequestURL::CLI;
+        } else {
+            $actualValue = $this->getActualValue();
+        }
+        if (in_array($operator, ['is', '!is'])) {
+            switch ($value) {
+                case 'webdav':
+                    if ($operator === 'is') {
+                        return $this->isWebDAVRequest();
+                    } else {
+                        return !$this->isWebDAVRequest();
+                    }
+            }
+        }
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		if ($this->url !== null) {
-			return $this->url;
-		}
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        if ($this->url !== null) {
+            return $this->url;
+        }
 
-		$this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
-		$this->url .= $this->request->getServerHost();// E.g. localhost
-		$this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
-		$this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
+        $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
+        $this->url .= $this->request->getServerHost();// E.g. localhost
+        $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
+        $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
 
-		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
-	}
+        return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
+    }
 
-	protected function isWebDAVRequest(): bool {
-		if ($this->url === RequestURL::CLI) {
-			return false;
-		}
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
-			$this->request->getPathInfo() === '/webdav'
-			|| str_starts_with($this->request->getPathInfo() ?? '', '/webdav/')
-			|| $this->request->getPathInfo() === '/dav/files'
-			|| str_starts_with($this->request->getPathInfo() ?? '', '/dav/files/')
-		);
-	}
+    protected function isWebDAVRequest(): bool {
+        if ($this->url === RequestURL::CLI) {
+            return false;
+        }
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
+            $this->request->getPathInfo() === '/webdav'
+            || str_starts_with($this->request->getPathInfo() ?? '', '/webdav/')
+            || $this->request->getPathInfo() === '/dav/files'
+            || str_starts_with($this->request->getPathInfo() ?? '', '/dav/files/')
+        );
+    }
 }

core/Command/Integrity/SignCore.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 			$this->checker->writeCoreSignature($x509, $rsa, $path);
 			$output->writeln('Successfully signed "core"');
 		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
+			$output->writeln('Error: '.$e->getMessage());
 			return 1;
 		}
 		return 0;

Indentation +49 added lines, -49 removed lines

@@ -22,60 +22,60 @@
  * @package OC\Core\Command\Integrity
  */
 class SignCore extends Command {
-	public function __construct(
-		private Checker $checker,
-		private FileAccessHelper $fileAccessHelper,
-	) {
-		parent::__construct(null);
-	}
+    public function __construct(
+        private Checker $checker,
+        private FileAccessHelper $fileAccessHelper,
+    ) {
+        parent::__construct(null);
+    }
 
-	protected function configure() {
-		$this
-			->setName('integrity:sign-core')
-			->setDescription('Sign core using a private key.')
-			->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
-			->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing')
-			->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign');
-	}
+    protected function configure() {
+        $this
+            ->setName('integrity:sign-core')
+            ->setDescription('Sign core using a private key.')
+            ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
+            ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing')
+            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$privateKeyPath = $input->getOption('privateKey');
-		$keyBundlePath = $input->getOption('certificate');
-		$path = $input->getOption('path');
-		if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) {
-			$output->writeln('--privateKey, --certificate and --path are required.');
-			return 1;
-		}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $privateKeyPath = $input->getOption('privateKey');
+        $keyBundlePath = $input->getOption('certificate');
+        $path = $input->getOption('path');
+        if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) {
+            $output->writeln('--privateKey, --certificate and --path are required.');
+            return 1;
+        }
 
-		$privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
-		$keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
+        $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
+        $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
 
-		if ($privateKey === false) {
-			$output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
-			return 1;
-		}
+        if ($privateKey === false) {
+            $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
+            return 1;
+        }
 
-		if ($keyBundle === false) {
-			$output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
-			return 1;
-		}
+        if ($keyBundle === false) {
+            $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
+            return 1;
+        }
 
-		$rsa = new RSA();
-		$rsa->loadKey($privateKey);
-		$x509 = new X509();
-		$x509->loadX509($keyBundle);
-		$x509->setPrivateKey($rsa);
+        $rsa = new RSA();
+        $rsa->loadKey($privateKey);
+        $x509 = new X509();
+        $x509->loadX509($keyBundle);
+        $x509->setPrivateKey($rsa);
 
-		try {
-			$this->checker->writeCoreSignature($x509, $rsa, $path);
-			$output->writeln('Successfully signed "core"');
-		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
-		return 0;
-	}
+        try {
+            $this->checker->writeCoreSignature($x509, $rsa, $path);
+            $output->writeln('Successfully signed "core"');
+        } catch (\Exception $e) {
+            $output->writeln('Error: ' . $e->getMessage());
+            return 1;
+        }
+        return 0;
+    }
 }

core/Command/TwoFactorAuth/Base.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 */
 	public function completeArgumentValues($argumentName, CompletionContext $context) {
 		if ($argumentName === 'uid') {
-			return array_map(function (IUser $user) {
+			return array_map(function(IUser $user) {
 				return $user->getUID();
 			}, $this->userManager->search($context->getCurrentWord(), 100));
 		}

Indentation +31 added lines, -31 removed lines

@@ -10,37 +10,37 @@
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 
 class Base extends \OC\Core\Command\Base {
-	public function __construct(
-		?string $name,
-		protected IUserManager $userManager,
-	) {
-		parent::__construct($name);
-	}
+    public function __construct(
+        ?string $name,
+        protected IUserManager $userManager,
+    ) {
+        parent::__construct($name);
+    }
 
-	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
+    /**
+     * Return possible values for the named option
+     *
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
 
-	/**
-	 * Return possible values for the named argument
-	 *
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'uid') {
-			return array_map(function (IUser $user) {
-				return $user->getUID();
-			}, $this->userManager->search($context->getCurrentWord(), 100));
-		}
-		return [];
-	}
+    /**
+     * Return possible values for the named argument
+     *
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'uid') {
+            return array_map(function (IUser $user) {
+                return $user->getUID();
+            }, $this->userManager->search($context->getCurrentWord(), 100));
+        }
+        return [];
+    }
 }

core/templates/twofactorshowchallenge.php

Braces +5 added lines, -2 removed lines

@@ -16,8 +16,11 @@
 	<?php if ($error): ?>
 			<?php if ($error_message): ?>
 				<p><strong><?php p($error_message); ?></strong></p>
-			<?php else: ?>
-				<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
+			<?php else {
+    : ?>
+				<p><strong><?php p($l->t('Error while validating your second factor'));
+}
+?></strong></p>
 			<?php endif; ?>
 	<?php endif; ?>
 	<?php print_unescaped($template); ?>

Indentation +5 added lines, -5 removed lines

@@ -29,11 +29,11 @@
 	<?php if (!is_null($_['backupProvider'])): ?>
 	<p>
 		<a class="two-factor-secondary" href="<?php p(\OCP\Server::get(\OCP\IURLGenerator::class)->linkToRoute('core.TwoFactorChallenge.showChallenge',
-			[
-				'challengeProviderId' => $_['backupProvider']->getId(),
-				'redirect_url' => $_['redirect_url'],
-			]
-		)) ?>">
+            [
+                'challengeProviderId' => $_['backupProvider']->getId(),
+                'redirect_url' => $_['redirect_url'],
+            ]
+        )) ?>">
 			<?php p($l->t('Use backup code')) ?>
 		</a>
 	</p>

apps/files_external/lib/Lib/Auth/InvalidAuth.php

Indentation +13 added lines, -13 removed lines

@@ -27,18 +27,18 @@
  */
 class InvalidAuth extends AuthMechanism {
 
-	/**
-	 * Constructs a new InvalidAuth with the id of the invalid auth
-	 * for display purposes
-	 *
-	 * @param string $invalidId invalid id
-	 */
-	public function __construct($invalidId) {
-		$this
-			->setIdentifier($invalidId)
-			->setScheme(self::SCHEME_NULL)
-			->setText('Unknown auth mechanism backend ' . $invalidId)
-		;
-	}
+    /**
+     * Constructs a new InvalidAuth with the id of the invalid auth
+     * for display purposes
+     *
+     * @param string $invalidId invalid id
+     */
+    public function __construct($invalidId) {
+        $this
+            ->setIdentifier($invalidId)
+            ->setScheme(self::SCHEME_NULL)
+            ->setText('Unknown auth mechanism backend ' . $invalidId)
+        ;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 		$this
 			->setIdentifier($invalidId)
 			->setScheme(self::SCHEME_NULL)
-			->setText('Unknown auth mechanism backend ' . $invalidId)
+			->setText('Unknown auth mechanism backend '.$invalidId)
 		;
 	}
 }

lib/public/Collaboration/Collaborators/ISearchPlugin.php

Indentation +9 added lines, -9 removed lines

@@ -30,13 +30,13 @@
  * @since 13.0.0
  */
 interface ISearchPlugin {
-	/**
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @param ISearchResult $searchResult
-	 * @return bool whether the plugin has more results
-	 * @since 13.0.0
-	 */
-	public function search($search, $limit, $offset, ISearchResult $searchResult);
+    /**
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @param ISearchResult $searchResult
+     * @return bool whether the plugin has more results
+     * @since 13.0.0
+     */
+    public function search($search, $limit, $offset, ISearchResult $searchResult);
 }

lib/private/AppFramework/Middleware/Security/Exceptions/LaxSameSiteCookieFailedException.php

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class LaxSameSiteCookieFailedException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
+    }
 }