nextcloud / server

core/Command/Integrity/SignApp.php

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 			$documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
 			$output->writeln('This command requires the --path, --privateKey and --certificate.');
 			$output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
-			$output->writeln('For more information please consult the documentation: '. $documentationUrl);
+			$output->writeln('For more information please consult the documentation: '.$documentationUrl);
 			return null;
 		}
 
@@ -107,7 +107,7 @@ 
 			$this->checker->writeAppSignature($path, $x509, $rsa);
 			$output->writeln('Successfully signed "'.$path.'"');
 		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
+			$output->writeln('Error: '.$e->getMessage());
 			return 1;
 		}
 		return 0;

Indentation +65 added lines, -65 removed lines

@@ -39,76 +39,76 @@
  * @package OC\Core\Command\Integrity
  */
 class SignApp extends Command {
-	/** @var Checker */
-	private $checker;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var Checker */
+    private $checker;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param Checker $checker
-	 * @param FileAccessHelper $fileAccessHelper
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(Checker $checker,
-								FileAccessHelper $fileAccessHelper,
-								IURLGenerator $urlGenerator) {
-		parent::__construct(null);
-		$this->checker = $checker;
-		$this->fileAccessHelper = $fileAccessHelper;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param Checker $checker
+     * @param FileAccessHelper $fileAccessHelper
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(Checker $checker,
+                                FileAccessHelper $fileAccessHelper,
+                                IURLGenerator $urlGenerator) {
+        parent::__construct(null);
+        $this->checker = $checker;
+        $this->fileAccessHelper = $fileAccessHelper;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	protected function configure() {
-		$this
-			->setName('integrity:sign-app')
-			->setDescription('Signs an app using a private key.')
-			->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign')
-			->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');
-	}
+    protected function configure() {
+        $this
+            ->setName('integrity:sign-app')
+            ->setDescription('Signs an app using a private key.')
+            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign')
+            ->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');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$path = $input->getOption('path');
-		$privateKeyPath = $input->getOption('privateKey');
-		$keyBundlePath = $input->getOption('certificate');
-		if (is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) {
-			$documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
-			$output->writeln('This command requires the --path, --privateKey and --certificate.');
-			$output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
-			$output->writeln('For more information please consult the documentation: '. $documentationUrl);
-			return null;
-		}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $path = $input->getOption('path');
+        $privateKeyPath = $input->getOption('privateKey');
+        $keyBundlePath = $input->getOption('certificate');
+        if (is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) {
+            $documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
+            $output->writeln('This command requires the --path, --privateKey and --certificate.');
+            $output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
+            $output->writeln('For more information please consult the documentation: '. $documentationUrl);
+            return null;
+        }
 
-		$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 null;
-		}
+        if ($privateKey === false) {
+            $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
+            return null;
+        }
 
-		if ($keyBundle === false) {
-			$output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
-			return null;
-		}
+        if ($keyBundle === false) {
+            $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
+            return null;
+        }
 
-		$rsa = new RSA();
-		$rsa->loadKey($privateKey);
-		$x509 = new X509();
-		$x509->loadX509($keyBundle);
-		$x509->setPrivateKey($rsa);
-		try {
-			$this->checker->writeAppSignature($path, $x509, $rsa);
-			$output->writeln('Successfully signed "'.$path.'"');
-		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
-		return 0;
-	}
+        $rsa = new RSA();
+        $rsa->loadKey($privateKey);
+        $x509 = new X509();
+        $x509->loadX509($keyBundle);
+        $x509->setPrivateKey($rsa);
+        try {
+            $this->checker->writeAppSignature($path, $x509, $rsa);
+            $output->writeln('Successfully signed "'.$path.'"');
+        } 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/Base.php

Indentation +31 added lines, -31 removed lines

@@ -37,39 +37,39 @@
  * Subclasses will override the getMode() function to specify the mode to configure.
  */
 abstract class Base extends Command {
-	abstract protected function getMode();
+    abstract protected function getMode();
 
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$mode = $this->getMode();
-		$this
-			->setName("background:$mode")
-			->setDescription("Use $mode to run background jobs");
-	}
+    protected function configure() {
+        $mode = $this->getMode();
+        $this
+            ->setName("background:$mode")
+            ->setDescription("Use $mode to run background jobs");
+    }
 
-	/**
-	 * Executing this command will set the background job mode for owncloud.
-	 * The mode to set is specified by the concrete sub class by implementing the
-	 * getMode() function.
-	 *
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mode = $this->getMode();
-		$this->config->setAppValue('core', 'backgroundjobs_mode', $mode);
-		$output->writeln("Set mode for background jobs to '$mode'");
-	}
+    /**
+     * Executing this command will set the background job mode for owncloud.
+     * The mode to set is specified by the concrete sub class by implementing the
+     * getMode() function.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mode = $this->getMode();
+        $this->config->setAppValue('core', 'backgroundjobs_mode', $mode);
+        $output->writeln("Set mode for background jobs to '$mode'");
+    }
 }

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/Config/System/GetConfig.php

Indentation +61 added lines, -61 removed lines

@@ -29,72 +29,72 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetConfig extends Base {
-	/** * @var SystemConfig */
-	protected $systemConfig;
+    /** * @var SystemConfig */
+    protected $systemConfig;
 
-	/**
-	 * @param SystemConfig $systemConfig
-	 */
-	public function __construct(SystemConfig $systemConfig) {
-		parent::__construct();
-		$this->systemConfig = $systemConfig;
-	}
+    /**
+     * @param SystemConfig $systemConfig
+     */
+    public function __construct(SystemConfig $systemConfig) {
+        parent::__construct();
+        $this->systemConfig = $systemConfig;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:system:get')
-			->setDescription('Get a system config value')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'Name of the config to get, specify multiple for array parameter'
-			)
-			->addOption(
-				'default-value',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'If no default value is set and the config does not exist, the command will exit with 1'
-			)
-		;
-	}
+        $this
+            ->setName('config:system:get')
+            ->setDescription('Get a system config value')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'Name of the config to get, specify multiple for array parameter'
+            )
+            ->addOption(
+                'default-value',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'If no default value is set and the config does not exist, the command will exit with 1'
+            )
+        ;
+    }
 
-	/**
-	 * Executes the current command.
-	 *
-	 * @param InputInterface  $input  An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 * @return null|int null or 0 if everything went fine, or an error code
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$configNames = $input->getArgument('name');
-		$configName = array_shift($configNames);
-		$defaultValue = $input->getOption('default-value');
+    /**
+     * Executes the current command.
+     *
+     * @param InputInterface  $input  An InputInterface instance
+     * @param OutputInterface $output An OutputInterface instance
+     * @return null|int null or 0 if everything went fine, or an error code
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $configNames = $input->getArgument('name');
+        $configName = array_shift($configNames);
+        $defaultValue = $input->getOption('default-value');
 
-		if (!in_array($configName, $this->systemConfig->getKeys()) && !$input->hasParameterOption('--default-value')) {
-			return 1;
-		}
+        if (!in_array($configName, $this->systemConfig->getKeys()) && !$input->hasParameterOption('--default-value')) {
+            return 1;
+        }
 
-		if (!in_array($configName, $this->systemConfig->getKeys())) {
-			$configValue = $defaultValue;
-		} else {
-			$configValue = $this->systemConfig->getValue($configName);
-			if (!empty($configNames)) {
-				foreach ($configNames as $configName) {
-					if (isset($configValue[$configName])) {
-						$configValue = $configValue[$configName];
-					} elseif (!$input->hasParameterOption('--default-value')) {
-						return 1;
-					} else {
-						$configValue = $defaultValue;
-						break;
-					}
-				}
-			}
-		}
+        if (!in_array($configName, $this->systemConfig->getKeys())) {
+            $configValue = $defaultValue;
+        } else {
+            $configValue = $this->systemConfig->getValue($configName);
+            if (!empty($configNames)) {
+                foreach ($configNames as $configName) {
+                    if (isset($configValue[$configName])) {
+                        $configValue = $configValue[$configName];
+                    } elseif (!$input->hasParameterOption('--default-value')) {
+                        return 1;
+                    } else {
+                        $configValue = $defaultValue;
+                        break;
+                    }
+                }
+            }
+        }
 
-		$this->writeMixedInOutputFormat($input, $output, $configValue);
-		return 0;
-	}
+        $this->writeMixedInOutputFormat($input, $output, $configValue);
+        return 0;
+    }
 }

core/Command/Status.php

Indentation +16 added lines, -16 removed lines

@@ -28,23 +28,23 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Status extends Base {
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('status')
-			->setDescription('show some status information')
-		;
-	}
+        $this
+            ->setName('status')
+            ->setDescription('show some status information')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$values = [
-			'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
-			'version' => implode('.', \OCP\Util::getVersion()),
-			'versionstring' => \OC_Util::getVersionString(),
-			'edition' => '',
-		];
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $values = [
+            'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
+            'version' => implode('.', \OCP\Util::getVersion()),
+            'versionstring' => \OC_Util::getVersionString(),
+            'edition' => '',
+        ];
 
-		$this->writeArrayInOutputFormat($input, $output, $values);
-	}
+        $this->writeArrayInOutputFormat($input, $output, $values);
+    }
 }

core/Command/User/LastSeen.php

Spacing +3 added lines, -3 removed lines

@@ -63,13 +63,13 @@
 
 		$lastLogin = $user->getLastLogin();
 		if ($lastLogin === 0) {
-			$output->writeln('User ' . $user->getUID() .
+			$output->writeln('User '.$user->getUID().
 				' has never logged in, yet.');
 		} else {
 			$date = new \DateTime();
 			$date->setTimestamp($lastLogin);
-			$output->writeln($user->getUID() .
-				'`s last login: ' . $date->format('d.m.Y H:i'));
+			$output->writeln($user->getUID().
+				'`s last login: '.$date->format('d.m.Y H:i'));
 		}
 	}
 }

Indentation +36 added lines, -36 removed lines

@@ -33,44 +33,44 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class LastSeen extends Command {
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:lastseen')
-			->setDescription('shows when the user was logged in last time')
-			->addArgument(
-				'uid',
-				InputArgument::REQUIRED,
-				'the username'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:lastseen')
+            ->setDescription('shows when the user was logged in last time')
+            ->addArgument(
+                'uid',
+                InputArgument::REQUIRED,
+                'the username'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $this->userManager->get($input->getArgument('uid'));
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $this->userManager->get($input->getArgument('uid'));
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return;
+        }
 
-		$lastLogin = $user->getLastLogin();
-		if ($lastLogin === 0) {
-			$output->writeln('User ' . $user->getUID() .
-				' has never logged in, yet.');
-		} else {
-			$date = new \DateTime();
-			$date->setTimestamp($lastLogin);
-			$output->writeln($user->getUID() .
-				'`s last login: ' . $date->format('d.m.Y H:i'));
-		}
-	}
+        $lastLogin = $user->getLastLogin();
+        if ($lastLogin === 0) {
+            $output->writeln('User ' . $user->getUID() .
+                ' has never logged in, yet.');
+        } else {
+            $date = new \DateTime();
+            $date->setTimestamp($lastLogin);
+            $output->writeln($user->getUID() .
+                '`s last login: ' . $date->format('d.m.Y H:i'));
+        }
+    }
 }