paul999 / phpbb_2fa

helper/session_helper.php

Spacing +3 added lines, -3 removed lines

@@ -72,10 +72,10 @@
 	 */
 	public function __construct(driver_interface $db, config $config, user $user, service_collection $modules, $registration_table, $user_table)
 	{
-		$this->db					= $db;
+		$this->db = $db;
 		$this->user_array			= $user;
-		$this->config				= $config;
-		$this->registration_table	= $registration_table;
+		$this->config = $config;
+		$this->registration_table = $registration_table;
 		$this->user_table			= $user_table;
 
 		$this->validateModules($modules);

controller/main_controller.php

Spacing +9 added lines, -9 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 		if (!empty($default))
 		{
 			$module = $this->session_helper->findModule($class);
-		}
-		else
+		} else
 		{
 			foreach ($modules as $row)
 			{

modules/u2f.php

Doc Comments +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	 *
 	 * Do not return false in case a specific user disabeld this module,
 	 * OR if the user is unable to use this specific module.
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function is_enabled()
 	{

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;
 

Braces +7 added lines, -9 removed lines

@@ -215,10 +215,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'));
 				}
+				}
 				throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG'));
 			}
 			$result = new AuthenticationResponse($response->signatureData, $response->clientData, $response->keyHandle, $response->errorCode);
@@ -232,12 +234,10 @@ 
 
 			$sql = 'UPDATE ' . $this->registration_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE registration_id = ' . (int)$reg->id;
 			$this->db->sql_query($sql);
-		}
-		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);
 		}
@@ -274,8 +274,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'] = '';
@@ -319,8 +318,7 @@ 
 			);
 
 			$this->update_session($sql_ary);
-		}
-		catch (U2fError $err)
+		} catch (U2fError $err)
 		{
 			$this->createError($err);
 		}

Spacing +7 added lines, -7 removed lines

@@ -75,7 +75,7 @@ 
 		$this->request  = $request;
 		$this->template = $template;
 
-		$this->registration_table	= $registration_table;
+		$this->registration_table = $registration_table;
 
 		$this->u2f = new \paul999\u2f\U2F('https://' . $this->request->server('HTTP_HOST'));
 	}
@@ -348,13 +348,13 @@ 
 				'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']);
 			$reg->setPublicKey($row['public_key']);
-			$reg->id			= $row['registration_id'];
-			$this->reg_data[]	= $reg;
+			$reg->id = $row['registration_id'];
+			$this->reg_data[] = $reg;
 		}
 		$this->db->sql_freeresult($result);
 	}
@@ -391,13 +391,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);

modules/module_interface.php

Indentation +75 added lines, -75 removed lines

@@ -1,93 +1,93 @@
 <?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\modules;
 
 interface module_interface
 {
-    /**
-     * Return if this module is enabled by the admin
-     * (And all server requirements are met).
-     *
-     * Do not return false in case a specific user disabeld this module,
-     * OR if the user is unable to use this specific module.
-     * @return boolean
-     */
-    public function is_enabled();
+	/**
+	 * Return if this module is enabled by the admin
+	 * (And all server requirements are met).
+	 *
+	 * Do not return false in case a specific user disabeld this module,
+	 * OR if the user is unable to use this specific module.
+	 * @return boolean
+	 */
+	public function is_enabled();
 
-    /**
-     * Check if the current user is able to use this module.
-     *
-     * This means that the user enabled it in the UCP,
-     * And has it setup up correctly.
-     * This method will be called during login, not during registration/
-     *
-     * @param int $user_id
-     * @return bool
-     */
-    public function is_usable($user_id);
+	/**
+	 * Check if the current user is able to use this module.
+	 *
+	 * This means that the user enabled it in the UCP,
+	 * And has it setup up correctly.
+	 * This method will be called during login, not during registration/
+	 *
+	 * @param int $user_id
+	 * @return bool
+	 */
+	public function is_usable($user_id);
 
-    /**
-     * Check if the user can potentially use this.
-     * This method is called at registration page.
-     *
-     * You can, for example, check if the current browser is suitable.
-     *
-     * @param int $user_id
-     * @return bool
-     */
-    public function is_potentially_usable($user_id);
+	/**
+	 * Check if the user can potentially use this.
+	 * This method is called at registration page.
+	 *
+	 * You can, for example, check if the current browser is suitable.
+	 *
+	 * @param int $user_id
+	 * @return bool
+	 */
+	public function is_potentially_usable($user_id);
 
-    /**
-     * Get the priority for this module.
-     * A lower priority means more chance it gets selected as default option
-     *
-     * There can be only one module with a specific priority!
-     * If there is already a module registered with this priority,
-     * a Exception might be thrown
-     *
-     * @param int $user_id If set, the priority can depend on the current user
-     * @return int
-     */
-    public function get_priority($user_id = 0);
+	/**
+	 * Get the priority for this module.
+	 * A lower priority means more chance it gets selected as default option
+	 *
+	 * There can be only one module with a specific priority!
+	 * If there is already a module registered with this priority,
+	 * a Exception might be thrown
+	 *
+	 * @param int $user_id If set, the priority can depend on the current user
+	 * @return int
+	 */
+	public function get_priority($user_id = 0);
 
-    /**
-     * Start of the login procedure.
-     * @param int $user_id
-     * @return int
-     */
-    public function login_start($user_id);
+	/**
+	 * Start of the login procedure.
+	 * @param int $user_id
+	 * @return int
+	 */
+	public function login_start($user_id);
 
-    /**
-     * Actual login procedure
-     * @param int $user_id
-     */
-    public function login($user_id);
+	/**
+	 * Actual login procedure
+	 * @param int $user_id
+	 */
+	public function login($user_id);
 
-    /**
-     * Start of registration
-     * @return void
-     */
-    public function register_start();
+	/**
+	 * Start of registration
+	 * @return void
+	 */
+	public function register_start();
 
-    /**
-     * Actual registration
-     * @return void
-     */
-    public function register();
+	/**
+	 * Actual registration
+	 * @return void
+	 */
+	public function register();
 
-    /**
-     * This method is called to show the UCP page.
-     * You can assign template variables to the template, or do anything else here.
-     */
-    public function show_ucp();
+	/**
+	 * This method is called to show the UCP page.
+	 * You can assign template variables to the template, or do anything else here.
+	 */
+	public function show_ucp();
 
 	/**
 	 * Delete a specific row from the UCP.