Completed
Push — master ( b5a957...040c1d )
by Paul
03:38
created
event/listener.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -76,14 +76,14 @@
 block discarded – undo
76 76
 	 */
77 77
 	public function __construct(session_helper_interface $helper, helper $controller_helper, user $user, request_interface $request, driver_interface $db, config $config, $php_ext, $root_path)
78 78
 	{
79
-		$this->helper				= $helper;
80
-		$this->controller_helper 	= $controller_helper;
81
-		$this->user					= $user;
79
+		$this->helper = $helper;
80
+		$this->controller_helper = $controller_helper;
81
+		$this->user = $user;
82 82
 		$this->request				= $request;
83
-		$this->config				= $config;
84
-		$this->db					= $db;
83
+		$this->config = $config;
84
+		$this->db = $db;
85 85
 		$this->php_ext				= $php_ext;
86
-		$this->root_path			= $root_path;
86
+		$this->root_path = $root_path;
87 87
 	}
88 88
 
89 89
 	/**
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -162,8 +162,7 @@
 block discarded – undo
162 162
 					// We simply return and continue the login procedure (The normal way :)),
163 163
 					// and will disable all pages untill he has added a 2FA key.
164 164
 					return;
165
-				}
166
-				else
165
+				} else
167 166
 				{
168 167
 					$redirect = $this->request->variable('redirect', "{$this->root_path}index.{$this->php_ext}");
169 168
 					if ($event['admin'])
Please login to merge, or discard this patch.
acp/tfa_module.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 			'title'	=> 'ACP_TFA_SETTINGS',
44 44
 			'vars'	=> array(
45 45
 				'legend1'				=> 'ACP_TFA_SETTINGS',
46
-				'tfa_mode'				=> array('lang' => 'TFA_MODE',			'validate' => 'bool',	'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
46
+				'tfa_mode'				=> array('lang' => 'TFA_MODE', 'validate' => 'bool', 'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
47 47
 
48 48
 				'legend4'				=> 'ACP_SUBMIT_CHANGES',
49 49
 			)
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 			$l_explain = '';
147 147
 			if ($vars['explain'] && isset($user->lang[$vars['lang'] . '_EXPLAIN']))
148 148
 			{
149
-				$l_explain =  $user->lang[$vars['lang'] . '_EXPLAIN'];
149
+				$l_explain = $user->lang[$vars['lang'] . '_EXPLAIN'];
150 150
 			}
151 151
 
152 152
 			$content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);
Please login to merge, or discard this patch.
acp/tfa_info.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * 2FA extension for the phpBB Forum Software package.
5
- *
6
- * @copyright (c) 2015 Paul Sohier
7
- * @license GNU General Public License, version 2 (GPL-2.0)
8
- *
9
- */
3
+	 *
4
+	 * 2FA extension for the phpBB Forum Software package.
5
+	 *
6
+	 * @copyright (c) 2015 Paul Sohier
7
+	 * @license GNU General Public License, version 2 (GPL-2.0)
8
+	 *
9
+	 */
10 10
 
11 11
 namespace paul999\tfa\acp;
12 12
 
Please login to merge, or discard this patch.
language/en/ucp_tfa.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * 2FA extension for the phpBB Forum Software package.
5
- *
6
- * @copyright (c) 2015 Paul Sohier
7
- * @license GNU General Public License, version 2 (GPL-2.0)
8
- *
9
- */
3
+	 *
4
+	 * 2FA extension for the phpBB Forum Software package.
5
+	 *
6
+	 * @copyright (c) 2015 Paul Sohier
7
+	 * @license GNU General Public License, version 2 (GPL-2.0)
8
+	 *
9
+	 */
10 10
 
11 11
 namespace paul999\tfa\acp;
12 12
 
Please login to merge, or discard this patch.
language/en/acp_tfa.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * 2FA extension for the phpBB Forum Software package.
5
- *
6
- * @copyright (c) 2015 Paul Sohier
7
- * @license GNU General Public License, version 2 (GPL-2.0)
8
- *
9
- */
3
+	 *
4
+	 * 2FA extension for the phpBB Forum Software package.
5
+	 *
6
+	 * @copyright (c) 2015 Paul Sohier
7
+	 * @license GNU General Public License, version 2 (GPL-2.0)
8
+	 *
9
+	 */
10 10
 
11 11
 namespace paul999\tfa\acp;
12 12
 
Please login to merge, or discard this patch.
language/en/info_ucp_tfa.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * 2FA extension for the phpBB Forum Software package.
5
- *
6
- * @copyright (c) 2015 Paul Sohier
7
- * @license GNU General Public License, version 2 (GPL-2.0)
8
- *
9
- */
3
+	 *
4
+	 * 2FA extension for the phpBB Forum Software package.
5
+	 *
6
+	 * @copyright (c) 2015 Paul Sohier
7
+	 * @license GNU General Public License, version 2 (GPL-2.0)
8
+	 *
9
+	 */
10 10
 
11 11
 namespace paul999\tfa\acp;
12 12
 
Please login to merge, or discard this patch.
language/en/permissions_tfa.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * 2FA extension for the phpBB Forum Software package.
5
- *
6
- * @copyright (c) 2015 Paul Sohier
7
- * @license GNU General Public License, version 2 (GPL-2.0)
8
- *
9
- */
3
+	 *
4
+	 * 2FA extension for the phpBB Forum Software package.
5
+	 *
6
+	 * @copyright (c) 2015 Paul Sohier
7
+	 * @license GNU General Public License, version 2 (GPL-2.0)
8
+	 *
9
+	 */
10 10
 
11 11
 namespace paul999\tfa\acp;
12 12
 
Please login to merge, or discard this patch.
language/en/info_acp_tfa.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * 2FA extension for the phpBB Forum Software package.
5
- *
6
- * @copyright (c) 2015 Paul Sohier
7
- * @license GNU General Public License, version 2 (GPL-2.0)
8
- *
9
- */
3
+	 *
4
+	 * 2FA extension for the phpBB Forum Software package.
5
+	 *
6
+	 * @copyright (c) 2015 Paul Sohier
7
+	 * @license GNU General Public License, version 2 (GPL-2.0)
8
+	 *
9
+	 */
10 10
 
11 11
 namespace paul999\tfa\acp;
12 12
 
Please login to merge, or discard this patch.
ucp/tfa_module.php 4 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * 2FA extension for the phpBB Forum Software package.
5
- *
6
- * @copyright (c) 2015 Paul Sohier
7
- * @license GNU General Public License, version 2 (GPL-2.0)
8
- *
9
- */
3
+	 *
4
+	 * 2FA extension for the phpBB Forum Software package.
5
+	 *
6
+	 * @copyright (c) 2015 Paul Sohier
7
+	 * @license GNU General Public License, version 2 (GPL-2.0)
8
+	 *
9
+	 */
10 10
 
11 11
 namespace paul999\tfa\acp;
12 12
 
Please login to merge, or discard this patch.
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -10,11 +10,7 @@
 block discarded – undo
10 10
 
11 11
 namespace paul999\tfa\ucp;
12 12
 
13
-use paul999\tfa\helper\registration_helper;
14 13
 use paul999\tfa\helper\session_helper;
15
-use paul999\u2f\Exceptions\U2fError;
16
-use paul999\u2f\U2F;
17
-use phpbb\db\driver\driver_interface;
18 14
 use phpbb\request\request_interface;
19 15
 use phpbb\template\template;
20 16
 use phpbb\user;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,10 +64,10 @@
 block discarded – undo
64 64
 	 */
65 65
 	private function setup(user $user, template $template, request_interface $request, session_helper $session_helper)
66 66
 	{
67
-		$this->user 				= $user;
67
+		$this->user = $user;
68 68
 		$this->template 			= $template;
69 69
 		$this->request 				= $request;
70
-		$this->session_helper 		= $session_helper;
70
+		$this->session_helper = $session_helper;
71 71
 	}
72 72
 
73 73
 	/**
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -103,13 +103,11 @@  discard block
 block discarded – undo
103 103
 				meta_refresh(3, $this->u_action);
104 104
 				$message = $this->user->lang['TFA_KEY_ADDED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
105 105
 				trigger_error($message);
106
-			}
107
-			else
106
+			} else
108 107
 			{
109 108
 				$error[] = $this->user->lang('TFA_MODULE_NOT_FOUND', $class);
110 109
 			}
111
-		}
112
-		catch (\Exception $e) {
110
+		} catch (\Exception $e) {
113 111
 			$error[] = $e->getMessage();
114 112
 		}
115 113
 	}
@@ -131,8 +129,7 @@  discard block
 block discarded – undo
131 129
 			if (!check_form_key('ucp_tfa_keys'))
132 130
 			{
133 131
 				$error[] = 'FORM_INVALID';
134
-			}
135
-			else
132
+			} else
136 133
 			{
137 134
 				switch ($mode)
138 135
 				{
Please login to merge, or discard this patch.