paul999 / phpbb_2fa

ucp/tfa_module.php

Spacing +1 added lines, -1 removed lines

@@ -199,7 +199,7 @@
 				'LAST_USED' => $this->user->format_date($row['last_used']),
 			));
 
-			$reg				= new registration_helper();
+			$reg = new registration_helper();
 			$reg->setCounter($row['counter']);
 			$reg->setCertificate($row['certificate']);
 			$reg->setKeyHandle($row['key_handle']);

Braces +4 added lines, -8 removed lines

@@ -131,12 +131,10 @@ 
 			$message = $this->user->lang['TFA_KEY_ADDED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 			trigger_error($message);
 
-		}
-		catch (U2fError $err)
+		} catch (U2fError $err)
 		{
 			$this->createError($err, $error);
-		}
-		catch (\InvalidArgumentException $e)
+		} catch (\InvalidArgumentException $e)
 		{
 			$error[] = $e->getMessage();
 		}
@@ -161,8 +159,7 @@ 
 			if (!check_form_key('ucp_tfa_keys'))
 			{
 				$error[] = 'FORM_INVALID';
-			}
-			else
+			} else
 			{
 				switch ($mode)
 				{
@@ -218,8 +215,7 @@ 
 		if ($count == 0)
 		{
 			trigger_error('TFA_UNABLE_TO_UPDATE_SESSION');
-		}
-		else if ($count > 1)
+		} else if ($count > 1)
 		{
 			// Reset sessions table. We had multiple sessions with same ID!!!
 			$sql_ary['u2f_request'] = '';

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- *
- * 2FA extension for the phpBB Forum Software package.
- *
- * @copyright (c) 2015 Paul Sohier
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- */
+	 *
+	 * 2FA extension for the phpBB Forum Software package.
+	 *
+	 * @copyright (c) 2015 Paul Sohier
+	 * @license GNU General Public License, version 2 (GPL-2.0)
+	 *
+	 */
 
 namespace paul999\tfa\acp;
 

event/listener.php

Spacing +6 added lines, -6 removed lines

@@ -76,14 +76,14 @@
 	 */
 	public function __construct(session_helper_interface $helper, helper $controller_helper, user $user, request_interface $request, driver_interface $db, config $config, $php_ext, $root_path)
 	{
-		$this->helper				= $helper;
-		$this->controller_helper 	= $controller_helper;
-		$this->user					= $user;
+		$this->helper = $helper;
+		$this->controller_helper = $controller_helper;
+		$this->user = $user;
 		$this->request				= $request;
-		$this->config				= $config;
-		$this->db					= $db;
+		$this->config = $config;
+		$this->db = $db;
 		$this->php_ext				= $php_ext;
-		$this->root_path			= $root_path;
+		$this->root_path = $root_path;
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -162,8 +162,7 @@
 					// We simply return and continue the login procedure (The normal way :)),
 					// and will disable all pages untill he has added a 2FA key.
 					return;
-				}
-				else
+				} else
 				{
 					$redirect = $this->request->variable('redirect', "{$this->root_path}index.{$this->php_ext}");
 					if ($event['admin'])

helper/session_helper.php

Spacing +4 added lines, -4 removed lines

@@ -56,10 +56,10 @@
 	 */
 	public function __construct(driver_interface $db, config $config, $registration_table, $user_table)
 	{
-		$this->db					= $db;
-		$this->config				= $config;
-		$this->registration_table	= $registration_table;
-		$this->user_table			= $user_table;
+		$this->db = $db;
+		$this->config = $config;
+		$this->registration_table = $registration_table;
+		$this->user_table = $user_table;
 	}
 
 	/**

acp/tfa_module.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 			'title'	=> 'ACP_TFA_SETTINGS',
 			'vars'	=> array(
 				'legend1'				=> 'ACP_TFA_SETTINGS',
-				'tfa_mode'				=> array('lang' => 'TFA_MODE',			'validate' => 'bool',	'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
+				'tfa_mode'				=> array('lang' => 'TFA_MODE', 'validate' => 'bool', 'type' => 'select', 'method' => 'select_tfa_method', 'explain' => true),
 
 				'legend4'				=> 'ACP_SUBMIT_CHANGES',
 			)
@@ -146,7 +146,7 @@ 
 			$l_explain = '';
 			if ($vars['explain'] && isset($user->lang[$vars['lang'] . '_EXPLAIN']))
 			{
-				$l_explain =  $user->lang[$vars['lang'] . '_EXPLAIN'];
+				$l_explain = $user->lang[$vars['lang'] . '_EXPLAIN'];
 			}
 
 			$content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars);

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- *
- * 2FA extension for the phpBB Forum Software package.
- *
- * @copyright (c) 2015 Paul Sohier
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- */
+	 *
+	 * 2FA extension for the phpBB Forum Software package.
+	 *
+	 * @copyright (c) 2015 Paul Sohier
+	 * @license GNU General Public License, version 2 (GPL-2.0)
+	 *
+	 */
 
 namespace paul999\tfa\acp;
 

acp/tfa_info.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- *
- * 2FA extension for the phpBB Forum Software package.
- *
- * @copyright (c) 2015 Paul Sohier
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- */
+	 *
+	 * 2FA extension for the phpBB Forum Software package.
+	 *
+	 * @copyright (c) 2015 Paul Sohier
+	 * @license GNU General Public License, version 2 (GPL-2.0)
+	 *
+	 */
 
 namespace paul999\tfa\acp;
 

controller/main_controller.php

Spacing +12 added lines, -12 removed lines

@@ -98,16 +98,16 @@ 
 	 */
 	public function __construct(helper $controller_helper, driver_interface $db, template $template, user $user, request_interface $request, config $config, $root_path, $php_ext, $user_table, $registration_table)
 	{
-		$this->controller_helper 	= $controller_helper;
-		$this->template 			= $template;
-		$this->db					= $db;
-		$this->user					= $user;
+		$this->controller_helper = $controller_helper;
+		$this->template = $template;
+		$this->db = $db;
+		$this->user = $user;
 		$this->request				= $request;
-		$this->config				= $config;
-		$this->root_path			= $root_path;
+		$this->config = $config;
+		$this->root_path = $root_path;
 		$this->php_ext				= $php_ext;
-		$this->user_table			= $user_table;
-		$this->registration_table	= $registration_table;
+		$this->user_table = $user_table;
+		$this->registration_table = $registration_table;
 
 		$this->u2f = new U2F('https://' . $this->request->server('HTTP_HOST'));
 	}
@@ -203,7 +203,7 @@ 
 		{
 			$response = json_decode(htmlspecialchars_decode($this->request->variable('authenticate', '')));
 
-			if (property_exists( $response, 'errorCode'))
+			if (property_exists($response, 'errorCode'))
 			{
 				if ($response->errorCode == 4) // errorCode 4 means that this device wasn't registered
 				{
@@ -276,13 +276,13 @@ 
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$reg 				= new registration_helper();
+			$reg = new registration_helper();
 			$reg->setCounter($row['counter']);
 			$reg->setCertificate($row['certificate']);
 			$reg->setKeyHandle($row['key_handle']);
 			$reg->setPublicKey($row['public_key']);
-			$reg->id 			= $row['registration_id'];
-			$rows[] 			= $reg;
+			$reg->id = $row['registration_id'];
+			$rows[] = $reg;
 		}
 
 		$this->db->sql_freeresult($result);

Braces +5 added lines, -5 removed lines

@@ -205,10 +205,12 @@ 
 
 			if (property_exists( $response, 'errorCode'))
 			{
-				if ($response->errorCode == 4) // errorCode 4 means that this device wasn't registered
+				if ($response->errorCode == 4) {
+					// errorCode 4 means that this device wasn't registered
 				{
 					throw new AccessDeniedHttpException($this->user->lang('TFA_NOT_REGISTERED'));
 				}
+				}
 			}
 
 			/** @var \paul999\tfa\helper\registration_helper $reg */
@@ -250,12 +252,10 @@ 
 				redirect(append_sid($redirect, false, true, $this->user->data['session_id']));
 			}
 			throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG'));
-		}
-		catch (U2fError $error)
+		} catch (U2fError $error)
 		{
 			$this->createError($error);
-		}
-		catch (\InvalidArgumentException $invalid)
+		} catch (\InvalidArgumentException $invalid)
 		{
 			throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG') . '<br />' . $invalid->getMessage(), $invalid);
 		}

language/en/ucp_tfa.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- *
- * 2FA extension for the phpBB Forum Software package.
- *
- * @copyright (c) 2015 Paul Sohier
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- */
+	 *
+	 * 2FA extension for the phpBB Forum Software package.
+	 *
+	 * @copyright (c) 2015 Paul Sohier
+	 * @license GNU General Public License, version 2 (GPL-2.0)
+	 *
+	 */
 
 namespace paul999\tfa\acp;
 

language/en/acp_tfa.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- *
- * 2FA extension for the phpBB Forum Software package.
- *
- * @copyright (c) 2015 Paul Sohier
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- */
+	 *
+	 * 2FA extension for the phpBB Forum Software package.
+	 *
+	 * @copyright (c) 2015 Paul Sohier
+	 * @license GNU General Public License, version 2 (GPL-2.0)
+	 *
+	 */
 
 namespace paul999\tfa\acp;
 

language/en/info_ucp_tfa.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- *
- * 2FA extension for the phpBB Forum Software package.
- *
- * @copyright (c) 2015 Paul Sohier
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- */
+	 *
+	 * 2FA extension for the phpBB Forum Software package.
+	 *
+	 * @copyright (c) 2015 Paul Sohier
+	 * @license GNU General Public License, version 2 (GPL-2.0)
+	 *
+	 */
 
 namespace paul999\tfa\acp;