Completed
Pull Request — master (#3869)
by Jan-Christoph
17:04
created
apps/theming/lib/Controller/IconController.php 1 patch
Indentation   +133 added lines, -133 removed lines patch added patch discarded remove patch
@@ -36,142 +36,142 @@
 block discarded – undo
36 36
 use OCP\IConfig;
37 37
 
38 38
 class IconController extends Controller {
39
-	/** @var ThemingDefaults */
40
-	private $themingDefaults;
41
-	/** @var Util */
42
-	private $util;
43
-	/** @var ITimeFactory */
44
-	private $timeFactory;
45
-	/** @var IConfig */
46
-	private $config;
47
-	/** @var IconBuilder */
48
-	private $iconBuilder;
49
-	/** @var ImageManager */
50
-	private $imageManager;
39
+    /** @var ThemingDefaults */
40
+    private $themingDefaults;
41
+    /** @var Util */
42
+    private $util;
43
+    /** @var ITimeFactory */
44
+    private $timeFactory;
45
+    /** @var IConfig */
46
+    private $config;
47
+    /** @var IconBuilder */
48
+    private $iconBuilder;
49
+    /** @var ImageManager */
50
+    private $imageManager;
51 51
 
52
-	/**
53
-	 * IconController constructor.
54
-	 *
55
-	 * @param string $appName
56
-	 * @param IRequest $request
57
-	 * @param ThemingDefaults $themingDefaults
58
-	 * @param Util $util
59
-	 * @param ITimeFactory $timeFactory
60
-	 * @param IConfig $config
61
-	 * @param IconBuilder $iconBuilder
62
-	 * @param ImageManager $imageManager
63
-	 */
64
-	public function __construct(
65
-		$appName,
66
-		IRequest $request,
67
-		ThemingDefaults $themingDefaults,
68
-		Util $util,
69
-		ITimeFactory $timeFactory,
70
-		IConfig $config,
71
-		IconBuilder $iconBuilder,
72
-		ImageManager $imageManager
73
-	) {
74
-		parent::__construct($appName, $request);
52
+    /**
53
+     * IconController constructor.
54
+     *
55
+     * @param string $appName
56
+     * @param IRequest $request
57
+     * @param ThemingDefaults $themingDefaults
58
+     * @param Util $util
59
+     * @param ITimeFactory $timeFactory
60
+     * @param IConfig $config
61
+     * @param IconBuilder $iconBuilder
62
+     * @param ImageManager $imageManager
63
+     */
64
+    public function __construct(
65
+        $appName,
66
+        IRequest $request,
67
+        ThemingDefaults $themingDefaults,
68
+        Util $util,
69
+        ITimeFactory $timeFactory,
70
+        IConfig $config,
71
+        IconBuilder $iconBuilder,
72
+        ImageManager $imageManager
73
+    ) {
74
+        parent::__construct($appName, $request);
75 75
 
76
-		$this->themingDefaults = $themingDefaults;
77
-		$this->util = $util;
78
-		$this->timeFactory = $timeFactory;
79
-		$this->config = $config;
80
-		$this->iconBuilder = $iconBuilder;
81
-		$this->imageManager = $imageManager;
82
-	}
76
+        $this->themingDefaults = $themingDefaults;
77
+        $this->util = $util;
78
+        $this->timeFactory = $timeFactory;
79
+        $this->config = $config;
80
+        $this->iconBuilder = $iconBuilder;
81
+        $this->imageManager = $imageManager;
82
+    }
83 83
 
84
-	/**
85
-	 * @PublicPage
86
-	 * @NoCSRFRequired
87
-	 *
88
-	 * @param $app string app name
89
-	 * @param $image string image file name (svg required)
90
-	 * @return FileDisplayResponse|NotFoundResponse
91
-	 */
92
-	public function getThemedIcon($app, $image) {
93
-		try {
94
-			$iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
95
-		} catch (NotFoundException $exception) {
96
-			$icon = $this->iconBuilder->colorSvg($app, $image);
97
-			if ($icon === false || $icon === "") {
98
-				return new NotFoundResponse();
99
-			}
100
-			$iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
101
-		}
102
-		if ($iconFile !== false) {
103
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
104
-			$response->cacheFor(86400);
105
-			$expires = new \DateTime();
106
-			$expires->setTimestamp($this->timeFactory->getTime());
107
-			$expires->add(new \DateInterval('PT24H'));
108
-			$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
109
-			$response->addHeader('Pragma', 'cache');
110
-			return $response;
111
-		} else {
112
-			return new NotFoundResponse();
113
-		}
114
-	}
84
+    /**
85
+     * @PublicPage
86
+     * @NoCSRFRequired
87
+     *
88
+     * @param $app string app name
89
+     * @param $image string image file name (svg required)
90
+     * @return FileDisplayResponse|NotFoundResponse
91
+     */
92
+    public function getThemedIcon($app, $image) {
93
+        try {
94
+            $iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
95
+        } catch (NotFoundException $exception) {
96
+            $icon = $this->iconBuilder->colorSvg($app, $image);
97
+            if ($icon === false || $icon === "") {
98
+                return new NotFoundResponse();
99
+            }
100
+            $iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
101
+        }
102
+        if ($iconFile !== false) {
103
+            $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
104
+            $response->cacheFor(86400);
105
+            $expires = new \DateTime();
106
+            $expires->setTimestamp($this->timeFactory->getTime());
107
+            $expires->add(new \DateInterval('PT24H'));
108
+            $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
109
+            $response->addHeader('Pragma', 'cache');
110
+            return $response;
111
+        } else {
112
+            return new NotFoundResponse();
113
+        }
114
+    }
115 115
 
116
-	/**
117
-	 * Return a 32x32 favicon as png
118
-	 *
119
-	 * @PublicPage
120
-	 * @NoCSRFRequired
121
-	 *
122
-	 * @param $app string app name
123
-	 * @return FileDisplayResponse|NotFoundResponse
124
-	 */
125
-	public function getFavicon($app = "core") {
126
-		if ($this->themingDefaults->shouldReplaceIcons()) {
127
-			try {
128
-				$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
129
-			} catch (NotFoundException $exception) {
130
-				$icon = $this->iconBuilder->getFavicon($app);
131
-				$iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
132
-			}
133
-			if ($iconFile !== false) {
134
-				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
135
-				$response->cacheFor(86400);
136
-				$expires = new \DateTime();
137
-				$expires->setTimestamp($this->timeFactory->getTime());
138
-				$expires->add(new \DateInterval('PT24H'));
139
-				$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
140
-				$response->addHeader('Pragma', 'cache');
141
-				return $response;
142
-			}
143
-		}
144
-		return new NotFoundResponse();
145
-	}
116
+    /**
117
+     * Return a 32x32 favicon as png
118
+     *
119
+     * @PublicPage
120
+     * @NoCSRFRequired
121
+     *
122
+     * @param $app string app name
123
+     * @return FileDisplayResponse|NotFoundResponse
124
+     */
125
+    public function getFavicon($app = "core") {
126
+        if ($this->themingDefaults->shouldReplaceIcons()) {
127
+            try {
128
+                $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
129
+            } catch (NotFoundException $exception) {
130
+                $icon = $this->iconBuilder->getFavicon($app);
131
+                $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
132
+            }
133
+            if ($iconFile !== false) {
134
+                $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
135
+                $response->cacheFor(86400);
136
+                $expires = new \DateTime();
137
+                $expires->setTimestamp($this->timeFactory->getTime());
138
+                $expires->add(new \DateInterval('PT24H'));
139
+                $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
140
+                $response->addHeader('Pragma', 'cache');
141
+                return $response;
142
+            }
143
+        }
144
+        return new NotFoundResponse();
145
+    }
146 146
 
147
-	/**
148
-	 * Return a 512x512 icon for touch devices
149
-	 *
150
-	 * @PublicPage
151
-	 * @NoCSRFRequired
152
-	 *
153
-	 * @param $app string app name
154
-	 * @return FileDisplayResponse|NotFoundResponse
155
-	 */
156
-	public function getTouchIcon($app = "core") {
157
-		if ($this->themingDefaults->shouldReplaceIcons()) {
158
-			try {
159
-				$iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
160
-			} catch (NotFoundException $exception) {
161
-				$icon = $this->iconBuilder->getTouchIcon($app);
162
-				$iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
163
-			}
164
-			if ($iconFile !== false) {
165
-				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
166
-				$response->cacheFor(86400);
167
-				$expires = new \DateTime();
168
-				$expires->setTimestamp($this->timeFactory->getTime());
169
-				$expires->add(new \DateInterval('PT24H'));
170
-				$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
171
-				$response->addHeader('Pragma', 'cache');
172
-				return $response;
173
-			}
174
-		}
175
-		return new NotFoundResponse();
176
-	}
147
+    /**
148
+     * Return a 512x512 icon for touch devices
149
+     *
150
+     * @PublicPage
151
+     * @NoCSRFRequired
152
+     *
153
+     * @param $app string app name
154
+     * @return FileDisplayResponse|NotFoundResponse
155
+     */
156
+    public function getTouchIcon($app = "core") {
157
+        if ($this->themingDefaults->shouldReplaceIcons()) {
158
+            try {
159
+                $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
160
+            } catch (NotFoundException $exception) {
161
+                $icon = $this->iconBuilder->getTouchIcon($app);
162
+                $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
163
+            }
164
+            if ($iconFile !== false) {
165
+                $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
166
+                $response->cacheFor(86400);
167
+                $expires = new \DateTime();
168
+                $expires->setTimestamp($this->timeFactory->getTime());
169
+                $expires->add(new \DateInterval('PT24H'));
170
+                $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
171
+                $response->addHeader('Pragma', 'cache');
172
+                return $response;
173
+            }
174
+        }
175
+        return new NotFoundResponse();
176
+    }
177 177
 }
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/theming/appinfo/app.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -24,31 +24,31 @@
 block discarded – undo
24 24
  */
25 25
 
26 26
 $linkToCSS = \OC::$server->getURLGenerator()->linkToRoute(
27
-	'theming.Theming.getStylesheet',
28
-	[
29
-		'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
30
-	]
27
+    'theming.Theming.getStylesheet',
28
+    [
29
+        'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
30
+    ]
31 31
 );
32 32
 \OCP\Util::addHeader(
33
-	'link',
34
-	[
35
-		'rel' => 'stylesheet',
36
-		'href' => $linkToCSS,
37
-	]
33
+    'link',
34
+    [
35
+        'rel' => 'stylesheet',
36
+        'href' => $linkToCSS,
37
+    ]
38 38
 );
39 39
 
40 40
 $linkToJs = \OC::$server->getURLGenerator()->linkToRoute(
41
-	'theming.Theming.getJavascript',
42
-	[
43
-		'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
44
-	]
41
+    'theming.Theming.getJavascript',
42
+    [
43
+        'v' => \OC::$server->getConfig()->getAppValue('theming', 'cachebuster', '0'),
44
+    ]
45 45
 );
46 46
 \OCP\Util::addHeader(
47
-	'script',
48
-	[
49
-		'src' => $linkToJs,
50
-		'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
51
-	], ''
47
+    'script',
48
+    [
49
+        'src' => $linkToJs,
50
+        'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
51
+    ], ''
52 52
 );
53 53
 
54 54
 $app = new \OCP\AppFramework\App('theming');
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php 1 patch
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -30,73 +30,73 @@
 block discarded – undo
30 30
 
31 31
 class BackupCodesProvider implements IProvider {
32 32
 
33
-	/** @var BackupCodeStorage */
34
-	private $storage;
33
+    /** @var BackupCodeStorage */
34
+    private $storage;
35 35
 
36
-	/** @var IL10N */
37
-	private $l10n;
36
+    /** @var IL10N */
37
+    private $l10n;
38 38
 
39
-	public function __construct(BackupCodeStorage $storage, IL10N $l10n) {
40
-		$this->l10n = $l10n;
41
-		$this->storage = $storage;
42
-	}
39
+    public function __construct(BackupCodeStorage $storage, IL10N $l10n) {
40
+        $this->l10n = $l10n;
41
+        $this->storage = $storage;
42
+    }
43 43
 
44
-	/**
45
-	 * Get unique identifier of this 2FA provider
46
-	 *
47
-	 * @return string
48
-	 */
49
-	public function getId() {
50
-		return 'backup_codes';
51
-	}
44
+    /**
45
+     * Get unique identifier of this 2FA provider
46
+     *
47
+     * @return string
48
+     */
49
+    public function getId() {
50
+        return 'backup_codes';
51
+    }
52 52
 
53
-	/**
54
-	 * Get the display name for selecting the 2FA provider
55
-	 *
56
-	 * @return string
57
-	 */
58
-	public function getDisplayName() {
59
-		return $this->l10n->t('Backup code');
60
-	}
53
+    /**
54
+     * Get the display name for selecting the 2FA provider
55
+     *
56
+     * @return string
57
+     */
58
+    public function getDisplayName() {
59
+        return $this->l10n->t('Backup code');
60
+    }
61 61
 
62
-	/**
63
-	 * Get the description for selecting the 2FA provider
64
-	 *
65
-	 * @return string
66
-	 */
67
-	public function getDescription() {
68
-		return $this->l10n->t('Use backup code');
69
-	}
62
+    /**
63
+     * Get the description for selecting the 2FA provider
64
+     *
65
+     * @return string
66
+     */
67
+    public function getDescription() {
68
+        return $this->l10n->t('Use backup code');
69
+    }
70 70
 
71
-	/**
72
-	 * Get the template for rending the 2FA provider view
73
-	 *
74
-	 * @param IUser $user
75
-	 * @return Template
76
-	 */
77
-	public function getTemplate(IUser $user) {
78
-		$tmpl = new Template('twofactor_backupcodes', 'challenge');
79
-		return $tmpl;
80
-	}
71
+    /**
72
+     * Get the template for rending the 2FA provider view
73
+     *
74
+     * @param IUser $user
75
+     * @return Template
76
+     */
77
+    public function getTemplate(IUser $user) {
78
+        $tmpl = new Template('twofactor_backupcodes', 'challenge');
79
+        return $tmpl;
80
+    }
81 81
 
82
-	/**
83
-	 * Verify the given challenge
84
-	 *
85
-	 * @param IUser $user
86
-	 * @param string $challenge
87
-	 */
88
-	public function verifyChallenge(IUser $user, $challenge) {
89
-		return $this->storage->validateCode($user, $challenge);
90
-	}
82
+    /**
83
+     * Verify the given challenge
84
+     *
85
+     * @param IUser $user
86
+     * @param string $challenge
87
+     */
88
+    public function verifyChallenge(IUser $user, $challenge) {
89
+        return $this->storage->validateCode($user, $challenge);
90
+    }
91 91
 
92
-	/**
93
-	 * Decides whether 2FA is enabled for the given user
94
-	 *
95
-	 * @param IUser $user
96
-	 * @return boolean
97
-	 */
98
-	public function isTwoFactorAuthEnabledForUser(IUser $user) {
99
-		return $this->storage->hasBackupCodes($user);
100
-	}
92
+    /**
93
+     * Decides whether 2FA is enabled for the given user
94
+     *
95
+     * @param IUser $user
96
+     * @return boolean
97
+     */
98
+    public function isTwoFactorAuthEnabledForUser(IUser $user) {
99
+        return $this->storage->hasBackupCodes($user);
100
+    }
101 101
 
102 102
 }
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Activity/Provider.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -31,42 +31,42 @@
 block discarded – undo
31 31
 
32 32
 class Provider implements IProvider {
33 33
 
34
-	/** @var L10nFactory */
35
-	private $l10n;
34
+    /** @var L10nFactory */
35
+    private $l10n;
36 36
 
37
-	/** @var IURLGenerator */
38
-	private $urlGenerator;
37
+    /** @var IURLGenerator */
38
+    private $urlGenerator;
39 39
 
40
-	/** @var ILogger */
41
-	private $logger;
40
+    /** @var ILogger */
41
+    private $logger;
42 42
 
43
-	/**
44
-	 * @param L10nFactory $l10n
45
-	 * @param IURLGenerator $urlGenerator
46
-	 * @param ILogger $logger
47
-	 */
48
-	public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, ILogger $logger) {
49
-		$this->logger = $logger;
50
-		$this->urlGenerator = $urlGenerator;
51
-		$this->l10n = $l10n;
52
-	}
43
+    /**
44
+     * @param L10nFactory $l10n
45
+     * @param IURLGenerator $urlGenerator
46
+     * @param ILogger $logger
47
+     */
48
+    public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, ILogger $logger) {
49
+        $this->logger = $logger;
50
+        $this->urlGenerator = $urlGenerator;
51
+        $this->l10n = $l10n;
52
+    }
53 53
 
54
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
55
-		if ($event->getApp() !== 'twofactor_backupcodes') {
56
-			throw new InvalidArgumentException();
57
-		}
54
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
55
+        if ($event->getApp() !== 'twofactor_backupcodes') {
56
+            throw new InvalidArgumentException();
57
+        }
58 58
 
59
-		$l = $this->l10n->get('twofactor_backupcodes', $language);
59
+        $l = $this->l10n->get('twofactor_backupcodes', $language);
60 60
 
61
-		switch ($event->getSubject()) {
62
-			case 'codes_generated':
63
-				$event->setParsedSubject($l->t('You created two-factor backup codes for your account'));
64
-				$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
65
-				break;
66
-			default:
67
-				throw new InvalidArgumentException();
68
-		}
69
-		return $event;
70
-	}
61
+        switch ($event->getSubject()) {
62
+            case 'codes_generated':
63
+                $event->setParsedSubject($l->t('You created two-factor backup codes for your account'));
64
+                $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
65
+                break;
66
+            default:
67
+                throw new InvalidArgumentException();
68
+        }
69
+        return $event;
70
+    }
71 71
 
72 72
 }
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Activity/GenericProvider.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -31,47 +31,47 @@
 block discarded – undo
31 31
 
32 32
 class GenericProvider implements IProvider {
33 33
 
34
-	/** @var L10nFactory */
35
-	private $l10n;
34
+    /** @var L10nFactory */
35
+    private $l10n;
36 36
 
37
-	/** @var IURLGenerator */
38
-	private $urlGenerator;
37
+    /** @var IURLGenerator */
38
+    private $urlGenerator;
39 39
 
40
-	/** @var ILogger */
41
-	private $logger;
40
+    /** @var ILogger */
41
+    private $logger;
42 42
 
43
-	public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, ILogger $logger) {
44
-		$this->logger = $logger;
45
-		$this->urlGenerator = $urlGenerator;
46
-		$this->l10n = $l10n;
47
-	}
43
+    public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, ILogger $logger) {
44
+        $this->logger = $logger;
45
+        $this->urlGenerator = $urlGenerator;
46
+        $this->l10n = $l10n;
47
+    }
48 48
 
49
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
50
-		if ($event->getType() !== 'twofactor') {
51
-			throw new InvalidArgumentException();
52
-		}
49
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
50
+        if ($event->getType() !== 'twofactor') {
51
+            throw new InvalidArgumentException();
52
+        }
53 53
 
54
-		$l = $this->l10n->get('core', $language);
54
+        $l = $this->l10n->get('core', $language);
55 55
 
56
-		switch ($event->getSubject()) {
57
-			case 'twofactor_success':
58
-				$params = $event->getSubjectParameters();
59
-				$event->setParsedSubject($l->t('You successfully logged in using two-factor authentication (%1$s)', [
60
-							$params['provider'],
61
-					]));
62
-				$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
63
-				break;
64
-			case 'twofactor_failed':
65
-				$params = $event->getSubjectParameters();
66
-				$event->setParsedSubject($l->t('A login attempt using two-factor authentication failed (%1$s)', [
67
-							$params['provider'],
68
-					]));
69
-				$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
70
-				break;
71
-			default:
72
-				throw new InvalidArgumentException();
73
-		}
74
-		return $event;
75
-	}
56
+        switch ($event->getSubject()) {
57
+            case 'twofactor_success':
58
+                $params = $event->getSubjectParameters();
59
+                $event->setParsedSubject($l->t('You successfully logged in using two-factor authentication (%1$s)', [
60
+                            $params['provider'],
61
+                    ]));
62
+                $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
63
+                break;
64
+            case 'twofactor_failed':
65
+                $params = $event->getSubjectParameters();
66
+                $event->setParsedSubject($l->t('A login attempt using two-factor authentication failed (%1$s)', [
67
+                            $params['provider'],
68
+                    ]));
69
+                $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
70
+                break;
71
+            default:
72
+                throw new InvalidArgumentException();
73
+        }
74
+        return $event;
75
+    }
76 76
 
77 77
 }
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Activity/GenericFilter.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -28,39 +28,39 @@
 block discarded – undo
28 28
 
29 29
 class GenericFilter implements IFilter {
30 30
 
31
-	/** @var IURLGenerator */
32
-	private $urlGenerator;
31
+    /** @var IURLGenerator */
32
+    private $urlGenerator;
33 33
 
34
-	/** @var IL10N */
35
-	private $l10n;
34
+    /** @var IL10N */
35
+    private $l10n;
36 36
 
37
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
38
-		$this->urlGenerator = $urlGenerator;
39
-		$this->l10n = $l10n;
40
-	}
37
+    public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
38
+        $this->urlGenerator = $urlGenerator;
39
+        $this->l10n = $l10n;
40
+    }
41 41
 
42
-	public function allowedApps() {
43
-		return [];
44
-	}
42
+    public function allowedApps() {
43
+        return [];
44
+    }
45 45
 
46
-	public function filterTypes(array $types) {
47
-		return array_intersect(['twofactor'], $types);
48
-	}
46
+    public function filterTypes(array $types) {
47
+        return array_intersect(['twofactor'], $types);
48
+    }
49 49
 
50
-	public function getIcon() {
51
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
52
-	}
50
+    public function getIcon() {
51
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg'));
52
+    }
53 53
 
54
-	public function getIdentifier() {
55
-		return 'twofactor';
56
-	}
54
+    public function getIdentifier() {
55
+        return 'twofactor';
56
+    }
57 57
 
58
-	public function getName() {
59
-		return $this->l10n->t('Two-factor authentication');
60
-	}
58
+    public function getName() {
59
+        return $this->l10n->t('Two-factor authentication');
60
+    }
61 61
 
62
-	public function getPriority() {
63
-		return 30;
64
-	}
62
+    public function getPriority() {
63
+        return 30;
64
+    }
65 65
 
66 66
 }
Please login to merge, or discard this patch.
apps/twofactor_backupcodes/lib/Activity/GenericSetting.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -27,39 +27,39 @@
 block discarded – undo
27 27
 
28 28
 class GenericSetting implements ISetting {
29 29
 
30
-	/** @var IL10N */
31
-	private $l10n;
30
+    /** @var IL10N */
31
+    private $l10n;
32 32
 
33
-	public function __construct(IL10N $l10n) {
34
-		$this->l10n = $l10n;
35
-	}
33
+    public function __construct(IL10N $l10n) {
34
+        $this->l10n = $l10n;
35
+    }
36 36
 
37
-	public function canChangeMail() {
38
-		return false;
39
-	}
37
+    public function canChangeMail() {
38
+        return false;
39
+    }
40 40
 
41
-	public function canChangeStream() {
42
-		return false;
43
-	}
41
+    public function canChangeStream() {
42
+        return false;
43
+    }
44 44
 
45
-	public function getIdentifier() {
46
-		return 'twofactor';
47
-	}
45
+    public function getIdentifier() {
46
+        return 'twofactor';
47
+    }
48 48
 
49
-	public function getName() {
50
-		return $this->l10n->t('Two-factor authentication');
51
-	}
49
+    public function getName() {
50
+        return $this->l10n->t('Two-factor authentication');
51
+    }
52 52
 
53
-	public function getPriority() {
54
-		return 30;
55
-	}
53
+    public function getPriority() {
54
+        return 30;
55
+    }
56 56
 
57
-	public function isDefaultEnabledMail() {
58
-		return true;
59
-	}
57
+    public function isDefaultEnabledMail() {
58
+        return true;
59
+    }
60 60
 
61
-	public function isDefaultEnabledStream() {
62
-		return true;
63
-	}
61
+    public function isDefaultEnabledStream() {
62
+        return true;
63
+    }
64 64
 
65 65
 }
Please login to merge, or discard this patch.