nextcloud / server

apps/files_versions/lib/BackgroundJob/ExpireVersions.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 			return;
 		}
 
-		$this->userManager->callForSeenUsers(function (IUser $user) {
+		$this->userManager->callForSeenUsers(function(IUser $user) {
 			$uid = $user->getUID();
 			if (!$this->setupFS($uid)) {
 				return;
@@ -85,7 +85,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_versions')) {
 			return false;
 		}

Indentation +50 added lines, -50 removed lines

@@ -32,65 +32,65 @@
 use OCP\IUserManager;
 
 class ExpireVersions extends \OC\BackgroundJob\TimedJob {
-	public const ITEMS_PER_SESSION = 1000;
+    public const ITEMS_PER_SESSION = 1000;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	public function __construct(IConfig $config, IUserManager $userManager, Expiration $expiration) {
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
+    public function __construct(IConfig $config, IUserManager $userManager, Expiration $expiration) {
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
 
-		$this->config = $config;
-		$this->expiration = $expiration;
-		$this->userManager = $userManager;
-	}
+        $this->config = $config;
+        $this->expiration = $expiration;
+        $this->userManager = $userManager;
+    }
 
-	public function run($argument) {
-		$backgroundJob = $this->config->getAppValue('files_versions', 'background_job_expire_versions', 'yes');
-		if ($backgroundJob === 'no') {
-			return;
-		}
+    public function run($argument) {
+        $backgroundJob = $this->config->getAppValue('files_versions', 'background_job_expire_versions', 'yes');
+        if ($backgroundJob === 'no') {
+            return;
+        }
 
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$this->userManager->callForSeenUsers(function (IUser $user) {
-			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
-				return;
-			}
-			Storage::expireOlderThanMaxForUser($uid);
-		});
-	}
+        $this->userManager->callForSeenUsers(function (IUser $user) {
+            $uid = $user->getUID();
+            if (!$this->setupFS($uid)) {
+                return;
+            }
+            Storage::expireOlderThanMaxForUser($uid);
+        });
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a versions directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

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 +57 added lines, -57 removed lines

@@ -39,69 +39,69 @@
  * @package OC\Core\Command\Integrity
  */
 class SignCore extends Command {
-	/** @var Checker */
-	private $checker;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
+    /** @var Checker */
+    private $checker;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
 
-	/**
-	 * @param Checker $checker
-	 * @param FileAccessHelper $fileAccessHelper
-	 */
-	public function __construct(Checker $checker,
-								FileAccessHelper $fileAccessHelper) {
-		parent::__construct(null);
-		$this->checker = $checker;
-		$this->fileAccessHelper = $fileAccessHelper;
-	}
+    /**
+     * @param Checker $checker
+     * @param FileAccessHelper $fileAccessHelper
+     */
+    public function __construct(Checker $checker,
+                                FileAccessHelper $fileAccessHelper) {
+        parent::__construct(null);
+        $this->checker = $checker;
+        $this->fileAccessHelper = $fileAccessHelper;
+    }
 
-	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 +27 added lines, -27 removed lines

@@ -31,33 +31,33 @@
 
 class Base extends \OC\Core\Command\Base {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * 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/Command/Background/Ajax.php

Indentation +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@
 namespace OC\Core\Command\Background;
 
 class Ajax extends Base {
-	protected function getMode() {
-		return 'ajax';
-	}
+    protected function getMode() {
+        return 'ajax';
+    }
 }

core/Command/Background/Cron.php

Indentation +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@
 namespace OC\Core\Command\Background;
 
 class Cron extends Base {
-	protected function getMode() {
-		return 'cron';
-	}
+    protected function getMode() {
+        return 'cron';
+    }
 }

core/Command/Background/WebCron.php

Indentation +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@
 namespace OC\Core\Command\Background;
 
 class WebCron extends Base {
-	protected function getMode() {
-		return 'webcron';
-	}
+    protected function getMode() {
+        return 'webcron';
+    }
 }

core/Command/Encryption/ListModules.php

Spacing +2 added lines, -2 removed lines

@@ -67,11 +67,11 @@
 	 */
 	protected function writeModuleList(InputInterface $input, OutputInterface $output, $items) {
 		if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-			array_walk($items, function (&$item) {
+			array_walk($items, function(&$item) {
 				if (!$item['default']) {
 					$item = $item['displayName'];
 				} else {
-					$item = $item['displayName'] . ' [default*]';
+					$item = $item['displayName'].' [default*]';
 				}
 			});
 		}

Indentation +57 added lines, -57 removed lines

@@ -31,70 +31,70 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListModules extends Base {
-	/** @var IManager */
-	protected $encryptionManager;
+    /** @var IManager */
+    protected $encryptionManager;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IManager $encryptionManager
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		IManager $encryptionManager,
-		IConfig $config
-	) {
-		parent::__construct();
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-	}
+    /**
+     * @param IManager $encryptionManager
+     * @param IConfig $config
+     */
+    public function __construct(
+        IManager $encryptionManager,
+        IConfig $config
+    ) {
+        parent::__construct();
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('encryption:list-modules')
-			->setDescription('List all available encryption modules')
-		;
-	}
+        $this
+            ->setName('encryption:list-modules')
+            ->setDescription('List all available encryption modules')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
-		if ($isMaintenanceModeEnabled) {
-			$output->writeln("Maintenance mode must be disabled when listing modules");
-			$output->writeln("in order to list the relevant encryption modules correctly.");
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
+        if ($isMaintenanceModeEnabled) {
+            $output->writeln("Maintenance mode must be disabled when listing modules");
+            $output->writeln("in order to list the relevant encryption modules correctly.");
+            return 1;
+        }
 
-		$encryptionModules = $this->encryptionManager->getEncryptionModules();
-		$defaultEncryptionModuleId = $this->encryptionManager->getDefaultEncryptionModuleId();
+        $encryptionModules = $this->encryptionManager->getEncryptionModules();
+        $defaultEncryptionModuleId = $this->encryptionManager->getDefaultEncryptionModuleId();
 
-		$encModules = [];
-		foreach ($encryptionModules as $module) {
-			$encModules[$module['id']]['displayName'] = $module['displayName'];
-			$encModules[$module['id']]['default'] = $module['id'] === $defaultEncryptionModuleId;
-		}
-		$this->writeModuleList($input, $output, $encModules);
-		return 0;
-	}
+        $encModules = [];
+        foreach ($encryptionModules as $module) {
+            $encModules[$module['id']]['displayName'] = $module['displayName'];
+            $encModules[$module['id']]['default'] = $module['id'] === $defaultEncryptionModuleId;
+        }
+        $this->writeModuleList($input, $output, $encModules);
+        return 0;
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param array $items
-	 */
-	protected function writeModuleList(InputInterface $input, OutputInterface $output, $items) {
-		if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-			array_walk($items, function (&$item) {
-				if (!$item['default']) {
-					$item = $item['displayName'];
-				} else {
-					$item = $item['displayName'] . ' [default*]';
-				}
-			});
-		}
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param array $items
+     */
+    protected function writeModuleList(InputInterface $input, OutputInterface $output, $items) {
+        if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
+            array_walk($items, function (&$item) {
+                if (!$item['default']) {
+                    $item = $item['displayName'];
+                } else {
+                    $item = $item['displayName'] . ' [default*]';
+                }
+            });
+        }
 
-		$this->writeArrayInOutputFormat($input, $output, $items);
-	}
+        $this->writeArrayInOutputFormat($input, $output, $items);
+    }
 }

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

@@ -24,11 +24,11 @@
 	<?php if (!is_null($_['backupProvider'])): ?>
 	<p>
 		<a class="two-factor-secondary" href="<?php p(\OC::$server->getURLGenerator()->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_sharing/lib/Middleware/OCSShareAPIMiddleware.php

Indentation +35 added lines, -35 removed lines

@@ -11,43 +11,43 @@
 use OCP\Share\IManager;
 
 class OCSShareAPIMiddleware extends Middleware {
-	/** @var IManager */
-	private $shareManager;
-	/** @var IL10N */
-	private $l;
+    /** @var IManager */
+    private $shareManager;
+    /** @var IL10N */
+    private $l;
 
-	public function __construct(IManager $shareManager,
-								IL10N $l) {
-		$this->shareManager = $shareManager;
-		$this->l = $l;
-	}
+    public function __construct(IManager $shareManager,
+                                IL10N $l) {
+        $this->shareManager = $shareManager;
+        $this->l = $l;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 *
-	 * @throws OCSNotFoundException
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($controller instanceof ShareAPIController) {
-			if (!$this->shareManager->shareApiEnabled()) {
-				throw new OCSNotFoundException($this->l->t('Share API is disabled'));
-			}
-		}
-	}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     *
+     * @throws OCSNotFoundException
+     */
+    public function beforeController($controller, $methodName) {
+        if ($controller instanceof ShareAPIController) {
+            if (!$this->shareManager->shareApiEnabled()) {
+                throw new OCSNotFoundException($this->l->t('Share API is disabled'));
+            }
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		if ($controller instanceof ShareAPIController) {
-			/** @var ShareAPIController $controller */
-			$controller->cleanup();
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        if ($controller instanceof ShareAPIController) {
+            /** @var ShareAPIController $controller */
+            $controller->cleanup();
+        }
 
-		return $response;
-	}
+        return $response;
+    }
 }