nextcloud / server

apps/updatenotification/lib/Controller/AdminController.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 		$currentChannel = \OCP\Util::getChannel();
 
 		// Remove the currently used channel from the channels list
-		if(($key = array_search($currentChannel, $channels)) !== false) {
+		if (($key = array_search($currentChannel, $channels)) !== false) {
 			unset($channels[$key]);
 		}
 		$updateState = $this->updateChecker->getUpdateState();

Indentation +140 added lines, -140 removed lines

@@ -39,144 +39,144 @@
 use OCP\Settings\ISettings;
 
 class AdminController extends Controller implements ISettings {
-	/** @var IJobList */
-	private $jobList;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IConfig */
-	private $config;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var UpdateChecker */
-	private $updateChecker;
-	/** @var IL10N */
-	private $l10n;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IJobList $jobList
-	 * @param ISecureRandom $secureRandom
-	 * @param IConfig $config
-	 * @param ITimeFactory $timeFactory
-	 * @param IL10N $l10n
-	 * @param UpdateChecker $updateChecker
-	 * @param IDateTimeFormatter $dateTimeFormatter
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IJobList $jobList,
-								ISecureRandom $secureRandom,
-								IConfig $config,
-								ITimeFactory $timeFactory,
-								IL10N $l10n,
-								UpdateChecker $updateChecker,
-								IDateTimeFormatter $dateTimeFormatter) {
-		parent::__construct($appName, $request);
-		$this->jobList = $jobList;
-		$this->secureRandom = $secureRandom;
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		$this->l10n = $l10n;
-		$this->updateChecker = $updateChecker;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-	}
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function displayPanel() {
-		$lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
-		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
-
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = \OCP\Util::getChannel();
-
-		// Remove the currently used channel from the channels list
-		if(($key = array_search($currentChannel, $channels)) !== false) {
-			unset($channels[$key]);
-		}
-		$updateState = $this->updateChecker->getUpdateState();
-
-		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
-
-		$defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
-		$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
-
-		$params = [
-			'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
-			'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
-			'lastChecked' => $lastUpdateCheck,
-			'currentChannel' => $currentChannel,
-			'channels' => $channels,
-			'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
-			'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
-			'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'],
-			'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
-			'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
-			'updateServerURL' => $updateServerURL,
-			'notify_groups' => implode('|', $notifyGroups),
-		];
-
-		return new TemplateResponse($this->appName, 'admin', $params, '');
-	}
-
-	/**
-	 * @UseSession
-	 *
-	 * @param string $channel
-	 * @return DataResponse
-	 */
-	public function setChannel($channel) {
-		\OCP\Util::setChannel($channel);
-		$this->config->setAppValue('core', 'lastupdatedat', 0);
-		return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function createCredentials() {
-		// Create a new job and store the creation date
-		$this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
-		$this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
-
-		// Create a new token
-		$newToken = $this->secureRandom->generate(64);
-		$this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
-
-		return new DataResponse($newToken);
-	}
-
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 */
-	public function getForm() {
-		return $this->displayPanel();
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'server';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 1;
-	}
+    /** @var IJobList */
+    private $jobList;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IConfig */
+    private $config;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var UpdateChecker */
+    private $updateChecker;
+    /** @var IL10N */
+    private $l10n;
+    /** @var IDateTimeFormatter */
+    private $dateTimeFormatter;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IJobList $jobList
+     * @param ISecureRandom $secureRandom
+     * @param IConfig $config
+     * @param ITimeFactory $timeFactory
+     * @param IL10N $l10n
+     * @param UpdateChecker $updateChecker
+     * @param IDateTimeFormatter $dateTimeFormatter
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IJobList $jobList,
+                                ISecureRandom $secureRandom,
+                                IConfig $config,
+                                ITimeFactory $timeFactory,
+                                IL10N $l10n,
+                                UpdateChecker $updateChecker,
+                                IDateTimeFormatter $dateTimeFormatter) {
+        parent::__construct($appName, $request);
+        $this->jobList = $jobList;
+        $this->secureRandom = $secureRandom;
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+        $this->l10n = $l10n;
+        $this->updateChecker = $updateChecker;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function displayPanel() {
+        $lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
+        $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
+
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = \OCP\Util::getChannel();
+
+        // Remove the currently used channel from the channels list
+        if(($key = array_search($currentChannel, $channels)) !== false) {
+            unset($channels[$key]);
+        }
+        $updateState = $this->updateChecker->getUpdateState();
+
+        $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
+
+        $defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
+        $updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
+
+        $params = [
+            'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
+            'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
+            'lastChecked' => $lastUpdateCheck,
+            'currentChannel' => $currentChannel,
+            'channels' => $channels,
+            'newVersionString' => (empty($updateState['updateVersion'])) ? '' : $updateState['updateVersion'],
+            'downloadLink' => (empty($updateState['downloadLink'])) ? '' : $updateState['downloadLink'],
+            'updaterEnabled' => (empty($updateState['updaterEnabled'])) ? false : $updateState['updaterEnabled'],
+            'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
+            'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
+            'updateServerURL' => $updateServerURL,
+            'notify_groups' => implode('|', $notifyGroups),
+        ];
+
+        return new TemplateResponse($this->appName, 'admin', $params, '');
+    }
+
+    /**
+     * @UseSession
+     *
+     * @param string $channel
+     * @return DataResponse
+     */
+    public function setChannel($channel) {
+        \OCP\Util::setChannel($channel);
+        $this->config->setAppValue('core', 'lastupdatedat', 0);
+        return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function createCredentials() {
+        // Create a new job and store the creation date
+        $this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
+        $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
+
+        // Create a new token
+        $newToken = $this->secureRandom->generate(64);
+        $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
+
+        return new DataResponse($newToken);
+    }
+
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     */
+    public function getForm() {
+        return $this->displayPanel();
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'server';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 1;
+    }
 }

apps/updatenotification/lib/AppInfo/Application.php

Indentation +21 added lines, -21 removed lines

@@ -30,27 +30,27 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct (array $urlParams = array()) {
-		parent::__construct('updatenotification', $urlParams);
-		$container = $this->getContainer();
+    public function __construct (array $urlParams = array()) {
+        parent::__construct('updatenotification', $urlParams);
+        $container = $this->getContainer();
 
-		$container->registerService('AdminController', function(IAppContainer $c) {
-			$updater = new \OC\Updater\VersionCheck(
-				\OC::$server->getHTTPClientService(),
-				\OC::$server->getConfig()
-			);
-			return new AdminController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->getServer()->getJobList(),
-				$c->getServer()->getSecureRandom(),
-				$c->getServer()->getConfig(),
-				new TimeFactory(),
-				$c->getServer()->getL10N($c->query('AppName')),
-				new UpdateChecker($updater),
-				$c->getServer()->getDateTimeFormatter()
-			);
-		});
-	}
+        $container->registerService('AdminController', function(IAppContainer $c) {
+            $updater = new \OC\Updater\VersionCheck(
+                \OC::$server->getHTTPClientService(),
+                \OC::$server->getConfig()
+            );
+            return new AdminController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $c->getServer()->getJobList(),
+                $c->getServer()->getSecureRandom(),
+                $c->getServer()->getConfig(),
+                new TimeFactory(),
+                $c->getServer()->getL10N($c->query('AppName')),
+                new UpdateChecker($updater),
+                $c->getServer()->getDateTimeFormatter()
+            );
+        });
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct (array $urlParams = array()) {
+	public function __construct(array $urlParams = array()) {
 		parent::__construct('updatenotification', $urlParams);
 		$container = $this->getContainer();
 

apps/updatenotification/lib/ResetTokenBackgroundJob.php

Indentation +35 added lines, -35 removed lines

@@ -34,44 +34,44 @@
  * @package OCA\UpdateNotification
  */
 class ResetTokenBackgroundJob extends TimedJob {
-	/** @var IConfig */
-	private $config;
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var IConfig */
+    private $config;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/**
-	 * @param IConfig|null $config
-	 * @param ITimeFactory|null $timeFactory
-	 */
-	public function __construct(IConfig $config = null,
-								ITimeFactory $timeFactory = null) {
-		// Run all 10 minutes
-		$this->setInterval(60 * 10);
+    /**
+     * @param IConfig|null $config
+     * @param ITimeFactory|null $timeFactory
+     */
+    public function __construct(IConfig $config = null,
+                                ITimeFactory $timeFactory = null) {
+        // Run all 10 minutes
+        $this->setInterval(60 * 10);
 
-		if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
-			$this->config = $config;
-			$this->timeFactory = $timeFactory;
-		} else {
-			$this->fixDIForJobs();
-		}
-	}
+        if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
+            $this->config = $config;
+            $this->timeFactory = $timeFactory;
+        } else {
+            $this->fixDIForJobs();
+        }
+    }
 
-	/**
-	 * DI for jobs
-	 */
-	private function fixDIForJobs() {
-		$this->config = \OC::$server->getConfig();
-		$this->timeFactory = new TimeFactory();
-	}
+    /**
+     * DI for jobs
+     */
+    private function fixDIForJobs() {
+        $this->config = \OC::$server->getConfig();
+        $this->timeFactory = new TimeFactory();
+    }
 
-	/**
-	 * @param $argument
-	 */
-	protected function run($argument) {
-		// Delete old tokens after 2 days
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
-			$this->config->deleteSystemValue('updater.secret');
-		}
-	}
+    /**
+     * @param $argument
+     */
+    protected function run($argument) {
+        // Delete old tokens after 2 days
+        if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
+            $this->config->deleteSystemValue('updater.secret');
+        }
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	 */
 	protected function run($argument) {
 		// Delete old tokens after 2 days
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
+		if ($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
 			$this->config->deleteSystemValue('updater.secret');
 		}
 	}

apps/updatenotification/appinfo/routes.php

Indentation +2 added lines, -2 removed lines

@@ -25,6 +25,6 @@
 
 $application = new Application();
 $application->registerRoutes($this, ['routes' => [
-	['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
-	['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
+    ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
+    ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
 ]]);

apps/updatenotification/appinfo/app.php

Indentation +27 added lines, -27 removed lines

@@ -23,33 +23,33 @@
  */
 
 if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
-	$updater = new \OC\Updater\VersionCheck(
-		\OC::$server->getHTTPClientService(),
-		\OC::$server->getConfig()
-	);
-	$updateChecker = new \OCA\UpdateNotification\UpdateChecker(
-		$updater
-	);
+    $updater = new \OC\Updater\VersionCheck(
+        \OC::$server->getHTTPClientService(),
+        \OC::$server->getConfig()
+    );
+    $updateChecker = new \OCA\UpdateNotification\UpdateChecker(
+        $updater
+    );
 
-	$userObject = \OC::$server->getUserSession()->getUser();
-	if($userObject !== null) {
-		if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
-			!\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
-			if($updateChecker->getUpdateState() !== []) {
-				\OCP\Util::addScript('updatenotification', 'notification');
-				OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
-			}
-		}
-	}
+    $userObject = \OC::$server->getUserSession()->getUser();
+    if($userObject !== null) {
+        if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
+            !\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
+            if($updateChecker->getUpdateState() !== []) {
+                \OCP\Util::addScript('updatenotification', 'notification');
+                OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
+            }
+        }
+    }
 
-	$manager = \OC::$server->getNotificationManager();
-	$manager->registerNotifier(function() use ($manager) {
-		return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
-	}, function() {
-		$l = \OC::$server->getL10N('updatenotification');
-		return [
-			'id' => 'updatenotification',
-			'name' => $l->t('Update notifications'),
-		];
-	});
+    $manager = \OC::$server->getNotificationManager();
+    $manager->registerNotifier(function() use ($manager) {
+        return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
+    }, function() {
+        $l = \OC::$server->getL10N('updatenotification');
+        return [
+            'id' => 'updatenotification',
+            'name' => $l->t('Update notifications'),
+        ];
+    });
 }

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  *
  */
 
-if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
+if (\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
 	$updater = new \OC\Updater\VersionCheck(
 		\OC::$server->getHTTPClientService(),
 		\OC::$server->getConfig()
@@ -32,10 +32,10 @@ 
 	);
 
 	$userObject = \OC::$server->getUserSession()->getUser();
-	if($userObject !== null) {
-		if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
+	if ($userObject !== null) {
+		if (\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
 			!\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
-			if($updateChecker->getUpdateState() !== []) {
+			if ($updateChecker->getUpdateState() !== []) {
 				\OCP\Util::addScript('updatenotification', 'notification');
 				OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
 			}

apps/theming/templates/settings-admin.php

Indentation -1 removed lines

@@ -1,6 +1,5 @@
 <?php
 /**
-
  *
  * @author Bjoern Schiessle <bjoern@schiessle.org>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>

apps/theming/lib/Settings/Section.php

Indentation +46 added lines, -46 removed lines

@@ -28,55 +28,55 @@
 use OCP\Settings\IIconSection;
 
 class Section implements IIconSection {
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $url;
+    /** @var IL10N */
+    private $l;
+    /** @var IURLGenerator */
+    private $url;
 
-	/**
-	 * @param IURLGenerator $url
-	 * @param IL10N $l
-	 */
-	public function __construct(IURLGenerator $url, IL10N $l) {
-		$this->url = $url;
-		$this->l = $l;
-	}
+    /**
+     * @param IURLGenerator $url
+     * @param IL10N $l
+     */
+    public function __construct(IURLGenerator $url, IL10N $l) {
+        $this->url = $url;
+        $this->l = $l;
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 */
-	public function getID() {
-		return 'theming';
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     */
+    public function getID() {
+        return 'theming';
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->l->t('Theming');
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->l->t('Theming');
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 30;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 30;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getIcon() {
-		return $this->url->imagePath('theming', 'app-dark.svg');
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getIcon() {
+        return $this->url->imagePath('theming', 'app-dark.svg');
+    }
 }

apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 
 		$uid = $user->getUID();
 		foreach (range(1, min([$number, 20])) as $i) {
-			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
 
 			$dbCode = new BackupCode();
 			$dbCode->setUserId($uid);
@@ -132,7 +132,7 @@ 
 		$codes = $this->mapper->getBackupCodes($user);
 		$total = count($codes);
 		$used = 0;
-		array_walk($codes, function (BackupCode $code) use (&$used) {
+		array_walk($codes, function(BackupCode $code) use (&$used) {
 			if (1 === (int) $code->getUsed()) {
 				$used++;
 			}

Indentation +128 added lines, -128 removed lines

@@ -33,133 +33,133 @@
 
 class BackupCodeStorage {
 
-	private static $CODE_LENGTH = 16;
-
-	/** @var BackupCodeMapper */
-	private $mapper;
-
-	/** @var IHasher */
-	private $hasher;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var IManager */
-	private $activityManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param BackupCodeMapper $mapper
-	 * @param ISecureRandom $random
-	 * @param IHasher $hasher
-	 * @param IManager $activityManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(BackupCodeMapper $mapper, ISecureRandom $random, IHasher $hasher,
-		IManager $activityManager, ILogger $logger) {
-		$this->mapper = $mapper;
-		$this->hasher = $hasher;
-		$this->random = $random;
-		$this->activityManager = $activityManager;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return string[]
-	 */
-	public function createCodes(IUser $user, $number = 10) {
-		$result = [];
-
-		// Delete existing ones
-		$this->mapper->deleteCodes($user);
-
-		$uid = $user->getUID();
-		foreach (range(1, min([$number, 20])) as $i) {
-			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
-
-			$dbCode = new BackupCode();
-			$dbCode->setUserId($uid);
-			$dbCode->setCode($this->hasher->hash($code));
-			$dbCode->setUsed(0);
-			$this->mapper->insert($dbCode);
-
-			array_push($result, $code);
-		}
-
-		$this->publishEvent($user, 'codes_generated');
-
-		return $result;
-	}
-
-	/**
-	 * Push an event the user's activity stream
-	 *
-	 * @param IUser $user
-	 * @param string $event
-	 */
-	private function publishEvent(IUser $user, $event) {
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('twofactor_backupcodes')
-			->setType('security')
-			->setAuthor($user->getUID())
-			->setAffectedUser($user->getUID())
-			->setSubject($event);
-		try {
-			$this->activityManager->publish($activity);
-		} catch (BadMethodCallException $e) {
-			$this->logger->warning('could not publish backup code creation activity', ['app' => 'twofactor_backupcodes']);
-			$this->logger->logException($e, ['app' => 'twofactor_backupcodes']);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return bool
-	 */
-	public function hasBackupCodes(IUser $user) {
-		$codes = $this->mapper->getBackupCodes($user);
-		return count($codes) > 0;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array
-	 */
-	public function getBackupCodesState(IUser $user) {
-		$codes = $this->mapper->getBackupCodes($user);
-		$total = count($codes);
-		$used = 0;
-		array_walk($codes, function (BackupCode $code) use (&$used) {
-			if (1 === (int) $code->getUsed()) {
-				$used++;
-			}
-		});
-		return [
-			'enabled' => $total > 0,
-			'total' => $total,
-			'used' => $used,
-		];
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string $code
-	 * @return bool
-	 */
-	public function validateCode(IUser $user, $code) {
-		$dbCodes = $this->mapper->getBackupCodes($user);
-
-		foreach ($dbCodes as $dbCode) {
-			if (0 === (int) $dbCode->getUsed() && $this->hasher->verify($code, $dbCode->getCode())) {
-				$dbCode->setUsed(1);
-				$this->mapper->update($dbCode);
-				return true;
-			}
-		}
-		return false;
-	}
+    private static $CODE_LENGTH = 16;
+
+    /** @var BackupCodeMapper */
+    private $mapper;
+
+    /** @var IHasher */
+    private $hasher;
+
+    /** @var ISecureRandom */
+    private $random;
+
+    /** @var IManager */
+    private $activityManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param BackupCodeMapper $mapper
+     * @param ISecureRandom $random
+     * @param IHasher $hasher
+     * @param IManager $activityManager
+     * @param ILogger $logger
+     */
+    public function __construct(BackupCodeMapper $mapper, ISecureRandom $random, IHasher $hasher,
+        IManager $activityManager, ILogger $logger) {
+        $this->mapper = $mapper;
+        $this->hasher = $hasher;
+        $this->random = $random;
+        $this->activityManager = $activityManager;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param IUser $user
+     * @return string[]
+     */
+    public function createCodes(IUser $user, $number = 10) {
+        $result = [];
+
+        // Delete existing ones
+        $this->mapper->deleteCodes($user);
+
+        $uid = $user->getUID();
+        foreach (range(1, min([$number, 20])) as $i) {
+            $code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+
+            $dbCode = new BackupCode();
+            $dbCode->setUserId($uid);
+            $dbCode->setCode($this->hasher->hash($code));
+            $dbCode->setUsed(0);
+            $this->mapper->insert($dbCode);
+
+            array_push($result, $code);
+        }
+
+        $this->publishEvent($user, 'codes_generated');
+
+        return $result;
+    }
+
+    /**
+     * Push an event the user's activity stream
+     *
+     * @param IUser $user
+     * @param string $event
+     */
+    private function publishEvent(IUser $user, $event) {
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('twofactor_backupcodes')
+            ->setType('security')
+            ->setAuthor($user->getUID())
+            ->setAffectedUser($user->getUID())
+            ->setSubject($event);
+        try {
+            $this->activityManager->publish($activity);
+        } catch (BadMethodCallException $e) {
+            $this->logger->warning('could not publish backup code creation activity', ['app' => 'twofactor_backupcodes']);
+            $this->logger->logException($e, ['app' => 'twofactor_backupcodes']);
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @return bool
+     */
+    public function hasBackupCodes(IUser $user) {
+        $codes = $this->mapper->getBackupCodes($user);
+        return count($codes) > 0;
+    }
+
+    /**
+     * @param IUser $user
+     * @return array
+     */
+    public function getBackupCodesState(IUser $user) {
+        $codes = $this->mapper->getBackupCodes($user);
+        $total = count($codes);
+        $used = 0;
+        array_walk($codes, function (BackupCode $code) use (&$used) {
+            if (1 === (int) $code->getUsed()) {
+                $used++;
+            }
+        });
+        return [
+            'enabled' => $total > 0,
+            'total' => $total,
+            'used' => $used,
+        ];
+    }
+
+    /**
+     * @param IUser $user
+     * @param string $code
+     * @return bool
+     */
+    public function validateCode(IUser $user, $code) {
+        $dbCodes = $this->mapper->getBackupCodes($user);
+
+        foreach ($dbCodes as $dbCode) {
+            if (0 === (int) $dbCode->getUsed() && $this->hasher->verify($code, $dbCode->getCode())) {
+                $dbCode->setUsed(1);
+                $this->mapper->update($dbCode);
+                return true;
+            }
+        }
+        return false;
+    }
 
 }

apps/twofactor_backupcodes/lib/Controller/SettingsController.php

Indentation +37 added lines, -37 removed lines

@@ -30,46 +30,46 @@
 
 class SettingsController extends Controller {
 
-	/** @var BackupCodeStorage */
-	private $storage;
+    /** @var BackupCodeStorage */
+    private $storage;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param BackupCodeStorage $storage
-	 * @param IUserSession $userSession
-	 */
-	public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) {
-		parent::__construct($appName, $request);
-		$this->userSession = $userSession;
-		$this->storage = $storage;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param BackupCodeStorage $storage
+     * @param IUserSession $userSession
+     */
+    public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) {
+        parent::__construct($appName, $request);
+        $this->userSession = $userSession;
+        $this->storage = $storage;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @return JSONResponse
-	 */
-	public function state() {
-		$user = $this->userSession->getUser();
-		return $this->storage->getBackupCodesState($user);
-	}
+    /**
+     * @NoAdminRequired
+     * @return JSONResponse
+     */
+    public function state() {
+        $user = $this->userSession->getUser();
+        return $this->storage->getBackupCodesState($user);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function createCodes() {
-		$user = $this->userSession->getUser();
-		$codes = $this->storage->createCodes($user);
-		return new JSONResponse([
-			'codes' => $codes,
-			'state' => $this->storage->getBackupCodesState($user),
-		]);
-	}
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @return JSONResponse
+     */
+    public function createCodes() {
+        $user = $this->userSession->getUser();
+        $codes = $this->storage->createCodes($user);
+        return new JSONResponse([
+            'codes' => $codes,
+            'state' => $this->storage->getBackupCodesState($user),
+        ]);
+    }
 
 }