paul999 / phpbb_2fa

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);
 		}