nextcloud / server

lib/private/Encryption/HookManager.php

Indentation +41 added lines, -41 removed lines

@@ -27,50 +27,50 @@
 use OC\Files\View;
 
 class HookManager {
-	/**
-	 * @var Update
-	 */
-	private static $updater;
+    /**
+     * @var Update
+     */
+    private static $updater;
 
-	public static function postShared($params) {
-		self::getUpdate()->postShared($params);
-	}
-	public static function postUnshared($params) {
-		self::getUpdate()->postUnshared($params);
-	}
+    public static function postShared($params) {
+        self::getUpdate()->postShared($params);
+    }
+    public static function postUnshared($params) {
+        self::getUpdate()->postUnshared($params);
+    }
 
-	public static function postRename($params) {
-		self::getUpdate()->postRename($params);
-	}
+    public static function postRename($params) {
+        self::getUpdate()->postRename($params);
+    }
 
-	public static function postRestore($params) {
-		self::getUpdate()->postRestore($params);
-	}
+    public static function postRestore($params) {
+        self::getUpdate()->postRestore($params);
+    }
 
-	/**
-	 * @return Update
-	 */
-	private static function getUpdate() {
-		if (is_null(self::$updater)) {
-			$user = \OC::$server->getUserSession()->getUser();
-			$uid = '';
-			if ($user) {
-				$uid = $user->getUID();
-			}
-			self::$updater = new Update(
-				new View(),
-				new Util(
-					new View(),
-					\OC::$server->getUserManager(),
-					\OC::$server->getGroupManager(),
-					\OC::$server->getConfig()),
-				Filesystem::getMountManager(),
-				\OC::$server->getEncryptionManager(),
-				\OC::$server->getEncryptionFilesHelper(),
-				$uid
-			);
-		}
+    /**
+     * @return Update
+     */
+    private static function getUpdate() {
+        if (is_null(self::$updater)) {
+            $user = \OC::$server->getUserSession()->getUser();
+            $uid = '';
+            if ($user) {
+                $uid = $user->getUID();
+            }
+            self::$updater = new Update(
+                new View(),
+                new Util(
+                    new View(),
+                    \OC::$server->getUserManager(),
+                    \OC::$server->getGroupManager(),
+                    \OC::$server->getConfig()),
+                Filesystem::getMountManager(),
+                \OC::$server->getEncryptionManager(),
+                \OC::$server->getEncryptionFilesHelper(),
+                $uid
+            );
+        }
 
-		return self::$updater;
-	}
+        return self::$updater;
+    }
 }

ocs-provider/index.php

Indentation +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@
 $server = \OC::$server;
 
 $controller = new \OC\OCS\Provider(
-	'ocs_provider',
-	$server->getRequest(),
-	$server->getAppManager()
+    'ocs_provider',
+    $server->getRequest(),
+    $server->getAppManager()
 );
 echo $controller->buildProviderList()->render();

core/templates/update.admin.php

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 		<h2 class="title"><?php p($l->t('App update required')); ?></h2>
 		<?php } else { ?>
 		<h2 class="title"><?php p($l->t('%s will be updated to version %s',
-			array($_['productName'], $_['version']))); ?></h2>
+            array($_['productName'], $_['version']))); ?></h2>
 		<?php } ?>
 		<?php if (!empty($_['appsToUpgrade'])) { ?>
 		<div class="infogroup">

core/templates/exception.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-	/** @var array $_ */
-	/** @var \OCP\IL10N $l */
+    /** @var array $_ */
+    /** @var \OCP\IL10N $l */
 
 style('core', ['styles', 'header']);
 ?>

core/Controller/UserController.php

Indentation +36 added lines, -36 removed lines

@@ -29,46 +29,46 @@
 use \OCP\IUserManager;
 
 class UserController extends Controller {
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	public function __construct($appName,
-								IRequest $request,
-								IUserManager $userManager
-	) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-	}
+    public function __construct($appName,
+                                IRequest $request,
+                                IUserManager $userManager
+    ) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * Lookup user display names
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param array $users
-	 *
-	 * @return JSONResponse
-	 */
-	public function getDisplayNames($users) {
-		$result = array();
+    /**
+     * Lookup user display names
+     *
+     * @NoAdminRequired
+     *
+     * @param array $users
+     *
+     * @return JSONResponse
+     */
+    public function getDisplayNames($users) {
+        $result = array();
 
-		foreach ($users as $user) {
-			$userObject = $this->userManager->get($user);
-			if (is_object($userObject)) {
-				$result[$user] = $userObject->getDisplayName();
-			} else {
-				$result[$user] = $user;
-			}
-		}
+        foreach ($users as $user) {
+            $userObject = $this->userManager->get($user);
+            if (is_object($userObject)) {
+                $result[$user] = $userObject->getDisplayName();
+            } else {
+                $result[$user] = $user;
+            }
+        }
 
-		$json = array(
-			'users' => $result,
-			'status' => 'success'
-		);
+        $json = array(
+            'users' => $result,
+            'status' => 'success'
+        );
 
-		return new JSONResponse($json);
+        return new JSONResponse($json);
 
-	}
+    }
 }

core/Command/Security/RemoveCertificate.php

Indentation +24 added lines, -24 removed lines

@@ -34,28 +34,28 @@
 
 class RemoveCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('security:certificates:remove')
-			->setDescription('remove trusted certificate')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'the file name of the certificate to remove'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$name = $input->getArgument('name');
-
-		$this->certificateManager->removeCertificate($name);
-	}
+    /** @var ICertificateManager */
+    protected $certificateManager;
+
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('security:certificates:remove')
+            ->setDescription('remove trusted certificate')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'the file name of the certificate to remove'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $name = $input->getArgument('name');
+
+        $this->certificateManager->removeCertificate($name);
+    }
 }

core/Command/Security/ListCertificates.php

Indentation +56 added lines, -56 removed lines

@@ -34,64 +34,64 @@
 
 class ListCertificates extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-	/** @var IL10N */
-	protected $l;
+    /** @var ICertificateManager */
+    protected $certificateManager;
+    /** @var IL10N */
+    protected $l;
 
-	public function __construct(ICertificateManager $certificateManager, IL10N $l) {
-		$this->certificateManager = $certificateManager;
-		$this->l = $l;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager, IL10N $l) {
+        $this->certificateManager = $certificateManager;
+        $this->l = $l;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates')
-			->setDescription('list trusted certificates');
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates')
+            ->setDescription('list trusted certificates');
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$outputType = $input->getOption('output');
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
-				return [
-					'name' => $certificate->getName(),
-					'common_name' => $certificate->getCommonName(),
-					'organization' => $certificate->getOrganization(),
-					'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
-					'issuer' => $certificate->getIssuerName(),
-					'issuer_organization' => $certificate->getIssuerOrganization(),
-					'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
-				];
-			}, $this->certificateManager->listCertificates());
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($certificates)));
-			} else {
-				$output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$table = new Table($output);
-			$table->setHeaders([
-				'File Name',
-				'Common Name',
-				'Organization',
-				'Valid Until',
-				'Issued By'
-			]);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $outputType = $input->getOption('output');
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $certificates = array_map(function (ICertificate $certificate) {
+                return [
+                    'name' => $certificate->getName(),
+                    'common_name' => $certificate->getCommonName(),
+                    'organization' => $certificate->getOrganization(),
+                    'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
+                    'issuer' => $certificate->getIssuerName(),
+                    'issuer_organization' => $certificate->getIssuerOrganization(),
+                    'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
+                ];
+            }, $this->certificateManager->listCertificates());
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($certificates)));
+            } else {
+                $output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $table = new Table($output);
+            $table->setHeaders([
+                'File Name',
+                'Common Name',
+                'Organization',
+                'Valid Until',
+                'Issued By'
+            ]);
 
-			$rows = array_map(function (ICertificate $certificate) {
-				return [
-					$certificate->getName(),
-					$certificate->getCommonName(),
-					$certificate->getOrganization(),
-					$this->l->l('date', $certificate->getExpireDate()),
-					$certificate->getIssuerName()
-				];
-			}, $this->certificateManager->listCertificates());
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
+            $rows = array_map(function (ICertificate $certificate) {
+                return [
+                    $certificate->getName(),
+                    $certificate->getCommonName(),
+                    $certificate->getOrganization(),
+                    $this->l->l('date', $certificate->getExpireDate()),
+                    $certificate->getIssuerName()
+                ];
+            }, $this->certificateManager->listCertificates());
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
 }

core/Command/Security/ImportCertificate.php

Indentation +26 added lines, -26 removed lines

@@ -33,36 +33,36 @@
 
 class ImportCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
+    /** @var ICertificateManager */
+    protected $certificateManager;
 
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates:import')
-			->setDescription('import trusted certificate')
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to the certificate to import'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates:import')
+            ->setDescription('import trusted certificate')
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to the certificate to import'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$path = $input->getArgument('path');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $path = $input->getArgument('path');
 
-		if (!file_exists($path)) {
-			$output->writeln('<error>certificate not found</error>');
-			return;
-		}
+        if (!file_exists($path)) {
+            $output->writeln('<error>certificate not found</error>');
+            return;
+        }
 
-		$certData = file_get_contents($path);
-		$name = basename($path);
+        $certData = file_get_contents($path);
+        $name = basename($path);
 
-		$this->certificateManager->addCertificate($certData, $name);
-	}
+        $this->certificateManager->addCertificate($certData, $name);
+    }
 }

core/Command/Log/Manage.php

Indentation +163 added lines, -163 removed lines

@@ -34,167 +34,167 @@
 
 class Manage extends Command implements CompletionAwareInterface {
 
-	const DEFAULT_BACKEND = 'file';
-	const DEFAULT_LOG_LEVEL = 2;
-	const DEFAULT_TIMEZONE = 'UTC';
-
-	/** @var IConfig */
-	protected $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('log:manage')
-			->setDescription('manage logging configuration')
-			->addOption(
-				'backend',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the logging backend [file, syslog, errorlog]'
-			)
-			->addOption(
-				'level',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the log level [debug, info, warning, error]'
-			)
-			->addOption(
-				'timezone',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the logging timezone'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		// collate config setting to the end, to avoid partial configuration
-		$toBeSet = [];
-
-		if ($backend = $input->getOption('backend')) {
-			$this->validateBackend($backend);
-			$toBeSet['log_type'] = $backend;
-		}
-
-		$level = $input->getOption('level');
-		if ($level !== null) {
-			if (is_numeric($level)) {
-				$levelNum = $level;
-				// sanity check
-				$this->convertLevelNumber($levelNum);
-			} else {
-				$levelNum = $this->convertLevelString($level);
-			}
-			$toBeSet['loglevel'] = $levelNum;
-		}
-
-		if ($timezone = $input->getOption('timezone')) {
-			$this->validateTimezone($timezone);
-			$toBeSet['logtimezone'] = $timezone;
-		}
-
-		// set config
-		foreach ($toBeSet as $option => $value) {
-			$this->config->setSystemValue($option, $value);
-		}
-
-		// display configuration
-		$backend = $this->config->getSystemValue('log_type', self::DEFAULT_BACKEND);
-		$output->writeln('Enabled logging backend: '.$backend);
-
-		$levelNum = $this->config->getSystemValue('loglevel', self::DEFAULT_LOG_LEVEL);
-		$level = $this->convertLevelNumber($levelNum);
-		$output->writeln('Log level: '.$level.' ('.$levelNum.')');
-
-		$timezone = $this->config->getSystemValue('logtimezone', self::DEFAULT_TIMEZONE);
-		$output->writeln('Log timezone: '.$timezone);
-	}
-
-	/**
-	 * @param string $backend
-	 * @throws \InvalidArgumentException
-	 */
-	protected function validateBackend($backend) {
-		if (!class_exists('OC\\Log\\'.ucfirst($backend))) {
-			throw new \InvalidArgumentException('Invalid backend');
-		}
-	}
-
-	/**
-	 * @param string $timezone
-	 * @throws \Exception
-	 */
-	protected function validateTimezone($timezone) {
-		new \DateTimeZone($timezone);
-	}
-
-	/**
-	 * @param string $level
-	 * @return int
-	 * @throws \InvalidArgumentException
-	 */
-	protected function convertLevelString($level) {
-		$level = strtolower($level);
-		switch ($level) {
-		case 'debug':
-			return 0;
-		case 'info':
-			return 1;
-		case 'warning':
-		case 'warn':
-			return 2;
-		case 'error':
-		case 'err':
-			return 3;
-		}
-		throw new \InvalidArgumentException('Invalid log level string');
-	}
-
-	/**
-	 * @param int $levelNum
-	 * @return string
-	 * @throws \InvalidArgumentException
-	 */
-	protected function convertLevelNumber($levelNum) {
-		switch ($levelNum) {
-		case 0:
-			return 'Debug';
-		case 1:
-			return 'Info';
-		case 2:
-			return 'Warning';
-		case 3:
-			return 'Error';
-		}
-		throw new \InvalidArgumentException('Invalid log level number');
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'backend') {
-			return ['file', 'syslog', 'errorlog'];
-		} else if ($optionName === 'level') {
-			return ['debug', 'info', 'warning', 'error'];
-		} else if ($optionName === 'timezone') {
-			return \DateTimeZone::listIdentifiers();
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    const DEFAULT_BACKEND = 'file';
+    const DEFAULT_LOG_LEVEL = 2;
+    const DEFAULT_TIMEZONE = 'UTC';
+
+    /** @var IConfig */
+    protected $config;
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('log:manage')
+            ->setDescription('manage logging configuration')
+            ->addOption(
+                'backend',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the logging backend [file, syslog, errorlog]'
+            )
+            ->addOption(
+                'level',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the log level [debug, info, warning, error]'
+            )
+            ->addOption(
+                'timezone',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the logging timezone'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        // collate config setting to the end, to avoid partial configuration
+        $toBeSet = [];
+
+        if ($backend = $input->getOption('backend')) {
+            $this->validateBackend($backend);
+            $toBeSet['log_type'] = $backend;
+        }
+
+        $level = $input->getOption('level');
+        if ($level !== null) {
+            if (is_numeric($level)) {
+                $levelNum = $level;
+                // sanity check
+                $this->convertLevelNumber($levelNum);
+            } else {
+                $levelNum = $this->convertLevelString($level);
+            }
+            $toBeSet['loglevel'] = $levelNum;
+        }
+
+        if ($timezone = $input->getOption('timezone')) {
+            $this->validateTimezone($timezone);
+            $toBeSet['logtimezone'] = $timezone;
+        }
+
+        // set config
+        foreach ($toBeSet as $option => $value) {
+            $this->config->setSystemValue($option, $value);
+        }
+
+        // display configuration
+        $backend = $this->config->getSystemValue('log_type', self::DEFAULT_BACKEND);
+        $output->writeln('Enabled logging backend: '.$backend);
+
+        $levelNum = $this->config->getSystemValue('loglevel', self::DEFAULT_LOG_LEVEL);
+        $level = $this->convertLevelNumber($levelNum);
+        $output->writeln('Log level: '.$level.' ('.$levelNum.')');
+
+        $timezone = $this->config->getSystemValue('logtimezone', self::DEFAULT_TIMEZONE);
+        $output->writeln('Log timezone: '.$timezone);
+    }
+
+    /**
+     * @param string $backend
+     * @throws \InvalidArgumentException
+     */
+    protected function validateBackend($backend) {
+        if (!class_exists('OC\\Log\\'.ucfirst($backend))) {
+            throw new \InvalidArgumentException('Invalid backend');
+        }
+    }
+
+    /**
+     * @param string $timezone
+     * @throws \Exception
+     */
+    protected function validateTimezone($timezone) {
+        new \DateTimeZone($timezone);
+    }
+
+    /**
+     * @param string $level
+     * @return int
+     * @throws \InvalidArgumentException
+     */
+    protected function convertLevelString($level) {
+        $level = strtolower($level);
+        switch ($level) {
+        case 'debug':
+            return 0;
+        case 'info':
+            return 1;
+        case 'warning':
+        case 'warn':
+            return 2;
+        case 'error':
+        case 'err':
+            return 3;
+        }
+        throw new \InvalidArgumentException('Invalid log level string');
+    }
+
+    /**
+     * @param int $levelNum
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    protected function convertLevelNumber($levelNum) {
+        switch ($levelNum) {
+        case 0:
+            return 'Debug';
+        case 1:
+            return 'Info';
+        case 2:
+            return 'Warning';
+        case 3:
+            return 'Error';
+        }
+        throw new \InvalidArgumentException('Invalid log level number');
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'backend') {
+            return ['file', 'syslog', 'errorlog'];
+        } else if ($optionName === 'level') {
+            return ['debug', 'info', 'warning', 'error'];
+        } else if ($optionName === 'timezone') {
+            return \DateTimeZone::listIdentifiers();
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }