Completed
Pull Request — master (#6014)
by Thomas
15:10
created
apps/updatenotification/lib/UpdateChecker.php 2 patches
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -26,48 +26,48 @@
 block discarded – undo
26 26
 use OC\Updater\VersionCheck;
27 27
 
28 28
 class UpdateChecker {
29
-	/** @var VersionCheck */
30
-	private $updater;
29
+    /** @var VersionCheck */
30
+    private $updater;
31 31
 
32
-	/**
33
-	 * @param VersionCheck $updater
34
-	 */
35
-	public function __construct(VersionCheck $updater) {
36
-		$this->updater = $updater;
37
-	}
32
+    /**
33
+     * @param VersionCheck $updater
34
+     */
35
+    public function __construct(VersionCheck $updater) {
36
+        $this->updater = $updater;
37
+    }
38 38
 
39
-	/**
40
-	 * @return array
41
-	 */
42
-	public function getUpdateState() {
43
-		$data = $this->updater->check();
44
-		$result = [];
39
+    /**
40
+     * @return array
41
+     */
42
+    public function getUpdateState() {
43
+        $data = $this->updater->check();
44
+        $result = [];
45 45
 
46
-		if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
47
-			$result['updateAvailable'] = true;
48
-			$result['updateVersion'] = $data['versionstring'];
49
-			$result['updaterEnabled'] = $data['autoupdater'] === '1';
50
-			if(substr($data['web'], 0, 8) === 'https://') {
51
-				$result['updateLink'] = $data['web'];
52
-			}
53
-			if(substr($data['url'], 0, 8) === 'https://') {
54
-				$result['downloadLink'] = $data['url'];
55
-			}
46
+        if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
47
+            $result['updateAvailable'] = true;
48
+            $result['updateVersion'] = $data['versionstring'];
49
+            $result['updaterEnabled'] = $data['autoupdater'] === '1';
50
+            if(substr($data['web'], 0, 8) === 'https://') {
51
+                $result['updateLink'] = $data['web'];
52
+            }
53
+            if(substr($data['url'], 0, 8) === 'https://') {
54
+                $result['downloadLink'] = $data['url'];
55
+            }
56 56
 
57
-			return $result;
58
-		}
57
+            return $result;
58
+        }
59 59
 
60
-		return [];
61
-	}
60
+        return [];
61
+    }
62 62
 
63
-	/**
64
-	 * @param array $data
65
-	 */
66
-	public function getJavaScript(array $data) {
67
-		$data['array']['oc_updateState'] =  json_encode([
68
-			'updateAvailable' => true,
69
-			'updateVersion' => $this->getUpdateState()['updateVersion'],
70
-			'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
71
-		]);
72
-	}
63
+    /**
64
+     * @param array $data
65
+     */
66
+    public function getJavaScript(array $data) {
67
+        $data['array']['oc_updateState'] =  json_encode([
68
+            'updateAvailable' => true,
69
+            'updateVersion' => $this->getUpdateState()['updateVersion'],
70
+            'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
71
+        ]);
72
+    }
73 73
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
 		$data = $this->updater->check();
44 44
 		$result = [];
45 45
 
46
-		if(isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
46
+		if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
47 47
 			$result['updateAvailable'] = true;
48 48
 			$result['updateVersion'] = $data['versionstring'];
49 49
 			$result['updaterEnabled'] = $data['autoupdater'] === '1';
50
-			if(substr($data['web'], 0, 8) === 'https://') {
50
+			if (substr($data['web'], 0, 8) === 'https://') {
51 51
 				$result['updateLink'] = $data['web'];
52 52
 			}
53
-			if(substr($data['url'], 0, 8) === 'https://') {
53
+			if (substr($data['url'], 0, 8) === 'https://') {
54 54
 				$result['downloadLink'] = $data['url'];
55 55
 			}
56 56
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @param array $data
65 65
 	 */
66 66
 	public function getJavaScript(array $data) {
67
-		$data['array']['oc_updateState'] =  json_encode([
67
+		$data['array']['oc_updateState'] = json_encode([
68 68
 			'updateAvailable' => true,
69 69
 			'updateVersion' => $this->getUpdateState()['updateVersion'],
70 70
 			'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
Please login to merge, or discard this patch.
apps/updatenotification/lib/AppInfo/Application.php 2 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -30,27 +30,27 @@
 block discarded – undo
30 30
 use OCP\AppFramework\IAppContainer;
31 31
 
32 32
 class Application extends App {
33
-	public function __construct (array $urlParams = array()) {
34
-		parent::__construct('updatenotification', $urlParams);
35
-		$container = $this->getContainer();
33
+    public function __construct (array $urlParams = array()) {
34
+        parent::__construct('updatenotification', $urlParams);
35
+        $container = $this->getContainer();
36 36
 
37
-		$container->registerService('AdminController', function(IAppContainer $c) {
38
-			$updater = new \OC\Updater\VersionCheck(
39
-				\OC::$server->getHTTPClientService(),
40
-				\OC::$server->getConfig()
41
-			);
42
-			return new AdminController(
43
-				$c->query('AppName'),
44
-				$c->query('Request'),
45
-				$c->getServer()->getJobList(),
46
-				$c->getServer()->getSecureRandom(),
47
-				$c->getServer()->getConfig(),
48
-				new TimeFactory(),
49
-				$c->getServer()->getL10N($c->query('AppName')),
50
-				new UpdateChecker($updater),
51
-				$c->getServer()->getDateTimeFormatter()
52
-			);
53
-		});
54
-	}
37
+        $container->registerService('AdminController', function(IAppContainer $c) {
38
+            $updater = new \OC\Updater\VersionCheck(
39
+                \OC::$server->getHTTPClientService(),
40
+                \OC::$server->getConfig()
41
+            );
42
+            return new AdminController(
43
+                $c->query('AppName'),
44
+                $c->query('Request'),
45
+                $c->getServer()->getJobList(),
46
+                $c->getServer()->getSecureRandom(),
47
+                $c->getServer()->getConfig(),
48
+                new TimeFactory(),
49
+                $c->getServer()->getL10N($c->query('AppName')),
50
+                new UpdateChecker($updater),
51
+                $c->getServer()->getDateTimeFormatter()
52
+            );
53
+        });
54
+    }
55 55
 
56 56
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 use OCP\AppFramework\IAppContainer;
31 31
 
32 32
 class Application extends App {
33
-	public function __construct (array $urlParams = array()) {
33
+	public function __construct(array $urlParams = array()) {
34 34
 		parent::__construct('updatenotification', $urlParams);
35 35
 		$container = $this->getContainer();
36 36
 
Please login to merge, or discard this patch.
apps/updatenotification/lib/ResetTokenBackgroundJob.php 2 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -34,44 +34,44 @@
 block discarded – undo
34 34
  * @package OCA\UpdateNotification
35 35
  */
36 36
 class ResetTokenBackgroundJob extends TimedJob {
37
-	/** @var IConfig */
38
-	private $config;
39
-	/** @var ITimeFactory */
40
-	private $timeFactory;
37
+    /** @var IConfig */
38
+    private $config;
39
+    /** @var ITimeFactory */
40
+    private $timeFactory;
41 41
 
42
-	/**
43
-	 * @param IConfig|null $config
44
-	 * @param ITimeFactory|null $timeFactory
45
-	 */
46
-	public function __construct(IConfig $config = null,
47
-								ITimeFactory $timeFactory = null) {
48
-		// Run all 10 minutes
49
-		$this->setInterval(60 * 10);
42
+    /**
43
+     * @param IConfig|null $config
44
+     * @param ITimeFactory|null $timeFactory
45
+     */
46
+    public function __construct(IConfig $config = null,
47
+                                ITimeFactory $timeFactory = null) {
48
+        // Run all 10 minutes
49
+        $this->setInterval(60 * 10);
50 50
 
51
-		if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
52
-			$this->config = $config;
53
-			$this->timeFactory = $timeFactory;
54
-		} else {
55
-			$this->fixDIForJobs();
56
-		}
57
-	}
51
+        if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
52
+            $this->config = $config;
53
+            $this->timeFactory = $timeFactory;
54
+        } else {
55
+            $this->fixDIForJobs();
56
+        }
57
+    }
58 58
 
59
-	/**
60
-	 * DI for jobs
61
-	 */
62
-	private function fixDIForJobs() {
63
-		$this->config = \OC::$server->getConfig();
64
-		$this->timeFactory = new TimeFactory();
65
-	}
59
+    /**
60
+     * DI for jobs
61
+     */
62
+    private function fixDIForJobs() {
63
+        $this->config = \OC::$server->getConfig();
64
+        $this->timeFactory = new TimeFactory();
65
+    }
66 66
 
67
-	/**
68
-	 * @param $argument
69
-	 */
70
-	protected function run($argument) {
71
-		// Delete old tokens after 2 days
72
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
73
-			$this->config->deleteSystemValue('updater.secret');
74
-		}
75
-	}
67
+    /**
68
+     * @param $argument
69
+     */
70
+    protected function run($argument) {
71
+        // Delete old tokens after 2 days
72
+        if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
73
+            $this->config->deleteSystemValue('updater.secret');
74
+        }
75
+    }
76 76
 
77 77
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 	 */
70 70
 	protected function run($argument) {
71 71
 		// Delete old tokens after 2 days
72
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
72
+		if ($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
73 73
 			$this->config->deleteSystemValue('updater.secret');
74 74
 		}
75 75
 	}
Please login to merge, or discard this patch.
apps/updatenotification/appinfo/routes.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,6 +25,6 @@
 block discarded – undo
25 25
 
26 26
 $application = new Application();
27 27
 $application->registerRoutes($this, ['routes' => [
28
-	['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
29
-	['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
28
+    ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
29
+    ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
30 30
 ]]);
Please login to merge, or discard this patch.
apps/updatenotification/appinfo/app.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -23,33 +23,33 @@
 block discarded – undo
23 23
  */
24 24
 
25 25
 if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
26
-	$updater = new \OC\Updater\VersionCheck(
27
-		\OC::$server->getHTTPClientService(),
28
-		\OC::$server->getConfig()
29
-	);
30
-	$updateChecker = new \OCA\UpdateNotification\UpdateChecker(
31
-		$updater
32
-	);
26
+    $updater = new \OC\Updater\VersionCheck(
27
+        \OC::$server->getHTTPClientService(),
28
+        \OC::$server->getConfig()
29
+    );
30
+    $updateChecker = new \OCA\UpdateNotification\UpdateChecker(
31
+        $updater
32
+    );
33 33
 
34
-	$userObject = \OC::$server->getUserSession()->getUser();
35
-	if($userObject !== null) {
36
-		if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
37
-			!\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
38
-			if($updateChecker->getUpdateState() !== []) {
39
-				\OCP\Util::addScript('updatenotification', 'notification');
40
-				OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
41
-			}
42
-		}
43
-	}
34
+    $userObject = \OC::$server->getUserSession()->getUser();
35
+    if($userObject !== null) {
36
+        if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
37
+            !\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
38
+            if($updateChecker->getUpdateState() !== []) {
39
+                \OCP\Util::addScript('updatenotification', 'notification');
40
+                OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
41
+            }
42
+        }
43
+    }
44 44
 
45
-	$manager = \OC::$server->getNotificationManager();
46
-	$manager->registerNotifier(function() use ($manager) {
47
-		return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
48
-	}, function() {
49
-		$l = \OC::$server->getL10N('updatenotification');
50
-		return [
51
-			'id' => 'updatenotification',
52
-			'name' => $l->t('Update notifications'),
53
-		];
54
-	});
45
+    $manager = \OC::$server->getNotificationManager();
46
+    $manager->registerNotifier(function() use ($manager) {
47
+        return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
48
+    }, function() {
49
+        $l = \OC::$server->getL10N('updatenotification');
50
+        return [
51
+            'id' => 'updatenotification',
52
+            'name' => $l->t('Update notifications'),
53
+        ];
54
+    });
55 55
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  *
23 23
  */
24 24
 
25
-if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
25
+if (\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
26 26
 	$updater = new \OC\Updater\VersionCheck(
27 27
 		\OC::$server->getHTTPClientService(),
28 28
 		\OC::$server->getConfig()
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
 	);
33 33
 
34 34
 	$userObject = \OC::$server->getUserSession()->getUser();
35
-	if($userObject !== null) {
36
-		if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
35
+	if ($userObject !== null) {
36
+		if (\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
37 37
 			!\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
38
-			if($updateChecker->getUpdateState() !== []) {
38
+			if ($updateChecker->getUpdateState() !== []) {
39 39
 				\OCP\Util::addScript('updatenotification', 'notification');
40 40
 				OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
41 41
 			}
Please login to merge, or discard this patch.
apps/theming/templates/settings-admin.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,5 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-
4 3
  *
5 4
  * @author Bjoern Schiessle <[email protected]>
6 5
  * @author Jan-Christoph Borchardt <[email protected]>
Please login to merge, or discard this patch.
apps/theming/lib/Settings/Section.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -28,55 +28,55 @@
 block discarded – undo
28 28
 use OCP\Settings\IIconSection;
29 29
 
30 30
 class Section implements IIconSection {
31
-	/** @var IL10N */
32
-	private $l;
33
-	/** @var IURLGenerator */
34
-	private $url;
31
+    /** @var IL10N */
32
+    private $l;
33
+    /** @var IURLGenerator */
34
+    private $url;
35 35
 
36
-	/**
37
-	 * @param IURLGenerator $url
38
-	 * @param IL10N $l
39
-	 */
40
-	public function __construct(IURLGenerator $url, IL10N $l) {
41
-		$this->url = $url;
42
-		$this->l = $l;
43
-	}
36
+    /**
37
+     * @param IURLGenerator $url
38
+     * @param IL10N $l
39
+     */
40
+    public function __construct(IURLGenerator $url, IL10N $l) {
41
+        $this->url = $url;
42
+        $this->l = $l;
43
+    }
44 44
 
45
-	/**
46
-	 * returns the ID of the section. It is supposed to be a lower case string,
47
-	 * e.g. 'ldap'
48
-	 *
49
-	 * @returns string
50
-	 */
51
-	public function getID() {
52
-		return 'theming';
53
-	}
45
+    /**
46
+     * returns the ID of the section. It is supposed to be a lower case string,
47
+     * e.g. 'ldap'
48
+     *
49
+     * @returns string
50
+     */
51
+    public function getID() {
52
+        return 'theming';
53
+    }
54 54
 
55
-	/**
56
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
57
-	 * integration'. Use the L10N service to translate it.
58
-	 *
59
-	 * @return string
60
-	 */
61
-	public function getName() {
62
-		return $this->l->t('Theming');
63
-	}
55
+    /**
56
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
57
+     * integration'. Use the L10N service to translate it.
58
+     *
59
+     * @return string
60
+     */
61
+    public function getName() {
62
+        return $this->l->t('Theming');
63
+    }
64 64
 
65
-	/**
66
-	 * @return int whether the form should be rather on the top or bottom of
67
-	 * the settings navigation. The sections are arranged in ascending order of
68
-	 * the priority values. It is required to return a value between 0 and 99.
69
-	 *
70
-	 * E.g.: 70
71
-	 */
72
-	public function getPriority() {
73
-		return 30;
74
-	}
65
+    /**
66
+     * @return int whether the form should be rather on the top or bottom of
67
+     * the settings navigation. The sections are arranged in ascending order of
68
+     * the priority values. It is required to return a value between 0 and 99.
69
+     *
70
+     * E.g.: 70
71
+     */
72
+    public function getPriority() {
73
+        return 30;
74
+    }
75 75
 
76
-	/**
77
-	 * {@inheritdoc}
78
-	 */
79
-	public function getIcon() {
80
-		return $this->url->imagePath('theming', 'app-dark.svg');
81
-	}
76
+    /**
77
+     * {@inheritdoc}
78
+     */
79
+    public function getIcon() {
80
+        return $this->url->imagePath('theming', 'app-dark.svg');
81
+    }
82 82
 }
Please login to merge, or discard this patch.
apps/theming/appinfo/routes.php 1 patch
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -25,58 +25,58 @@
 block discarded – undo
25 25
  */
26 26
 
27 27
 return ['routes' => [
28
-	[
29
-		'name' => 'Theming#updateStylesheet',
30
-		'url' => '/ajax/updateStylesheet',
31
-		'verb' => 'POST'
32
-	],
33
-	[
34
-		'name' => 'Theming#undo',
35
-		'url' => '/ajax/undoChanges',
36
-		'verb' => 'POST'
37
-	],
38
-	[
39
-		'name' => 'Theming#updateLogo',
40
-		'url' => '/ajax/updateLogo',
41
-		'verb' => 'POST'
42
-	],
43
-	[
44
-		'name' => 'Theming#getStylesheet',
45
-		'url' => '/styles',
46
-		'verb' => 'GET',
47
-	],
48
-	[
49
-		'name' => 'Theming#getLogo',
50
-		'url' => '/logo',
51
-		'verb' => 'GET',
52
-	],
53
-	[
54
-		'name' => 'Theming#getLoginBackground',
55
-		'url' => '/loginbackground',
56
-		'verb' => 'GET',
57
-	],
58
-	[
59
-		'name' => 'Theming#getJavascript',
60
-		'url' => '/js/theming',
61
-		'verb' => 'GET',
62
-	],
63
-	[
64
-		'name'	=> 'Icon#getFavicon',
65
-		'url' => '/favicon/{app}',
66
-		'verb' => 'GET',
67
-		'defaults' => array('app' => 'core'),
68
-	],
69
-	[
70
-		'name'	=> 'Icon#getTouchIcon',
71
-		'url' => '/icon/{app}',
72
-		'verb' => 'GET',
73
-		'defaults' => array('app' => 'core'),
74
-	],
75
-	[
76
-		'name'	=> 'Icon#getThemedIcon',
77
-		'url' => '/img/{app}/{image}',
78
-		'verb' => 'GET',
79
-		'requirements' => array('image' => '.+')
80
-	],
28
+    [
29
+        'name' => 'Theming#updateStylesheet',
30
+        'url' => '/ajax/updateStylesheet',
31
+        'verb' => 'POST'
32
+    ],
33
+    [
34
+        'name' => 'Theming#undo',
35
+        'url' => '/ajax/undoChanges',
36
+        'verb' => 'POST'
37
+    ],
38
+    [
39
+        'name' => 'Theming#updateLogo',
40
+        'url' => '/ajax/updateLogo',
41
+        'verb' => 'POST'
42
+    ],
43
+    [
44
+        'name' => 'Theming#getStylesheet',
45
+        'url' => '/styles',
46
+        'verb' => 'GET',
47
+    ],
48
+    [
49
+        'name' => 'Theming#getLogo',
50
+        'url' => '/logo',
51
+        'verb' => 'GET',
52
+    ],
53
+    [
54
+        'name' => 'Theming#getLoginBackground',
55
+        'url' => '/loginbackground',
56
+        'verb' => 'GET',
57
+    ],
58
+    [
59
+        'name' => 'Theming#getJavascript',
60
+        'url' => '/js/theming',
61
+        'verb' => 'GET',
62
+    ],
63
+    [
64
+        'name'	=> 'Icon#getFavicon',
65
+        'url' => '/favicon/{app}',
66
+        'verb' => 'GET',
67
+        'defaults' => array('app' => 'core'),
68
+    ],
69
+    [
70
+        'name'	=> 'Icon#getTouchIcon',
71
+        'url' => '/icon/{app}',
72
+        'verb' => 'GET',
73
+        'defaults' => array('app' => 'core'),
74
+    ],
75
+    [
76
+        'name'	=> 'Icon#getThemedIcon',
77
+        'url' => '/img/{app}/{image}',
78
+        'verb' => 'GET',
79
+        'requirements' => array('image' => '.+')
80
+    ],
81 81
 ]];
82 82
 
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 		$uid = $user->getUID();
80 80
 		foreach (range(1, min([$number, 20])) as $i) {
81
-			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
81
+			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
82 82
 
83 83
 			$dbCode = new BackupCode();
84 84
 			$dbCode->setUserId($uid);
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		$codes = $this->mapper->getBackupCodes($user);
133 133
 		$total = count($codes);
134 134
 		$used = 0;
135
-		array_walk($codes, function (BackupCode $code) use (&$used) {
135
+		array_walk($codes, function(BackupCode $code) use (&$used) {
136 136
 			if (1 === (int) $code->getUsed()) {
137 137
 				$used++;
138 138
 			}
Please login to merge, or discard this patch.
Indentation   +128 added lines, -128 removed lines patch added patch discarded remove patch
@@ -33,133 +33,133 @@
 block discarded – undo
33 33
 
34 34
 class BackupCodeStorage {
35 35
 
36
-	private static $CODE_LENGTH = 16;
37
-
38
-	/** @var BackupCodeMapper */
39
-	private $mapper;
40
-
41
-	/** @var IHasher */
42
-	private $hasher;
43
-
44
-	/** @var ISecureRandom */
45
-	private $random;
46
-
47
-	/** @var IManager */
48
-	private $activityManager;
49
-
50
-	/** @var ILogger */
51
-	private $logger;
52
-
53
-	/**
54
-	 * @param BackupCodeMapper $mapper
55
-	 * @param ISecureRandom $random
56
-	 * @param IHasher $hasher
57
-	 * @param IManager $activityManager
58
-	 * @param ILogger $logger
59
-	 */
60
-	public function __construct(BackupCodeMapper $mapper, ISecureRandom $random, IHasher $hasher,
61
-		IManager $activityManager, ILogger $logger) {
62
-		$this->mapper = $mapper;
63
-		$this->hasher = $hasher;
64
-		$this->random = $random;
65
-		$this->activityManager = $activityManager;
66
-		$this->logger = $logger;
67
-	}
68
-
69
-	/**
70
-	 * @param IUser $user
71
-	 * @return string[]
72
-	 */
73
-	public function createCodes(IUser $user, $number = 10) {
74
-		$result = [];
75
-
76
-		// Delete existing ones
77
-		$this->mapper->deleteCodes($user);
78
-
79
-		$uid = $user->getUID();
80
-		foreach (range(1, min([$number, 20])) as $i) {
81
-			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
82
-
83
-			$dbCode = new BackupCode();
84
-			$dbCode->setUserId($uid);
85
-			$dbCode->setCode($this->hasher->hash($code));
86
-			$dbCode->setUsed(0);
87
-			$this->mapper->insert($dbCode);
88
-
89
-			array_push($result, $code);
90
-		}
91
-
92
-		$this->publishEvent($user, 'codes_generated');
93
-
94
-		return $result;
95
-	}
96
-
97
-	/**
98
-	 * Push an event the user's activity stream
99
-	 *
100
-	 * @param IUser $user
101
-	 * @param string $event
102
-	 */
103
-	private function publishEvent(IUser $user, $event) {
104
-		$activity = $this->activityManager->generateEvent();
105
-		$activity->setApp('twofactor_backupcodes')
106
-			->setType('security')
107
-			->setAuthor($user->getUID())
108
-			->setAffectedUser($user->getUID())
109
-			->setSubject($event);
110
-		try {
111
-			$this->activityManager->publish($activity);
112
-		} catch (BadMethodCallException $e) {
113
-			$this->logger->warning('could not publish backup code creation activity', ['app' => 'twofactor_backupcodes']);
114
-			$this->logger->logException($e, ['app' => 'twofactor_backupcodes']);
115
-		}
116
-	}
117
-
118
-	/**
119
-	 * @param IUser $user
120
-	 * @return bool
121
-	 */
122
-	public function hasBackupCodes(IUser $user) {
123
-		$codes = $this->mapper->getBackupCodes($user);
124
-		return count($codes) > 0;
125
-	}
126
-
127
-	/**
128
-	 * @param IUser $user
129
-	 * @return array
130
-	 */
131
-	public function getBackupCodesState(IUser $user) {
132
-		$codes = $this->mapper->getBackupCodes($user);
133
-		$total = count($codes);
134
-		$used = 0;
135
-		array_walk($codes, function (BackupCode $code) use (&$used) {
136
-			if (1 === (int) $code->getUsed()) {
137
-				$used++;
138
-			}
139
-		});
140
-		return [
141
-			'enabled' => $total > 0,
142
-			'total' => $total,
143
-			'used' => $used,
144
-		];
145
-	}
146
-
147
-	/**
148
-	 * @param IUser $user
149
-	 * @param string $code
150
-	 * @return bool
151
-	 */
152
-	public function validateCode(IUser $user, $code) {
153
-		$dbCodes = $this->mapper->getBackupCodes($user);
154
-
155
-		foreach ($dbCodes as $dbCode) {
156
-			if (0 === (int) $dbCode->getUsed() && $this->hasher->verify($code, $dbCode->getCode())) {
157
-				$dbCode->setUsed(1);
158
-				$this->mapper->update($dbCode);
159
-				return true;
160
-			}
161
-		}
162
-		return false;
163
-	}
36
+    private static $CODE_LENGTH = 16;
37
+
38
+    /** @var BackupCodeMapper */
39
+    private $mapper;
40
+
41
+    /** @var IHasher */
42
+    private $hasher;
43
+
44
+    /** @var ISecureRandom */
45
+    private $random;
46
+
47
+    /** @var IManager */
48
+    private $activityManager;
49
+
50
+    /** @var ILogger */
51
+    private $logger;
52
+
53
+    /**
54
+     * @param BackupCodeMapper $mapper
55
+     * @param ISecureRandom $random
56
+     * @param IHasher $hasher
57
+     * @param IManager $activityManager
58
+     * @param ILogger $logger
59
+     */
60
+    public function __construct(BackupCodeMapper $mapper, ISecureRandom $random, IHasher $hasher,
61
+        IManager $activityManager, ILogger $logger) {
62
+        $this->mapper = $mapper;
63
+        $this->hasher = $hasher;
64
+        $this->random = $random;
65
+        $this->activityManager = $activityManager;
66
+        $this->logger = $logger;
67
+    }
68
+
69
+    /**
70
+     * @param IUser $user
71
+     * @return string[]
72
+     */
73
+    public function createCodes(IUser $user, $number = 10) {
74
+        $result = [];
75
+
76
+        // Delete existing ones
77
+        $this->mapper->deleteCodes($user);
78
+
79
+        $uid = $user->getUID();
80
+        foreach (range(1, min([$number, 20])) as $i) {
81
+            $code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
82
+
83
+            $dbCode = new BackupCode();
84
+            $dbCode->setUserId($uid);
85
+            $dbCode->setCode($this->hasher->hash($code));
86
+            $dbCode->setUsed(0);
87
+            $this->mapper->insert($dbCode);
88
+
89
+            array_push($result, $code);
90
+        }
91
+
92
+        $this->publishEvent($user, 'codes_generated');
93
+
94
+        return $result;
95
+    }
96
+
97
+    /**
98
+     * Push an event the user's activity stream
99
+     *
100
+     * @param IUser $user
101
+     * @param string $event
102
+     */
103
+    private function publishEvent(IUser $user, $event) {
104
+        $activity = $this->activityManager->generateEvent();
105
+        $activity->setApp('twofactor_backupcodes')
106
+            ->setType('security')
107
+            ->setAuthor($user->getUID())
108
+            ->setAffectedUser($user->getUID())
109
+            ->setSubject($event);
110
+        try {
111
+            $this->activityManager->publish($activity);
112
+        } catch (BadMethodCallException $e) {
113
+            $this->logger->warning('could not publish backup code creation activity', ['app' => 'twofactor_backupcodes']);
114
+            $this->logger->logException($e, ['app' => 'twofactor_backupcodes']);
115
+        }
116
+    }
117
+
118
+    /**
119
+     * @param IUser $user
120
+     * @return bool
121
+     */
122
+    public function hasBackupCodes(IUser $user) {
123
+        $codes = $this->mapper->getBackupCodes($user);
124
+        return count($codes) > 0;
125
+    }
126
+
127
+    /**
128
+     * @param IUser $user
129
+     * @return array
130
+     */
131
+    public function getBackupCodesState(IUser $user) {
132
+        $codes = $this->mapper->getBackupCodes($user);
133
+        $total = count($codes);
134
+        $used = 0;
135
+        array_walk($codes, function (BackupCode $code) use (&$used) {
136
+            if (1 === (int) $code->getUsed()) {
137
+                $used++;
138
+            }
139
+        });
140
+        return [
141
+            'enabled' => $total > 0,
142
+            'total' => $total,
143
+            'used' => $used,
144
+        ];
145
+    }
146
+
147
+    /**
148
+     * @param IUser $user
149
+     * @param string $code
150
+     * @return bool
151
+     */
152
+    public function validateCode(IUser $user, $code) {
153
+        $dbCodes = $this->mapper->getBackupCodes($user);
154
+
155
+        foreach ($dbCodes as $dbCode) {
156
+            if (0 === (int) $dbCode->getUsed() && $this->hasher->verify($code, $dbCode->getCode())) {
157
+                $dbCode->setUsed(1);
158
+                $this->mapper->update($dbCode);
159
+                return true;
160
+            }
161
+        }
162
+        return false;
163
+    }
164 164
 
165 165
 }
Please login to merge, or discard this patch.