paul999 / phpbb_2fa

modules/u2f.php

Indentation +36 added lines, -36 removed lines

@@ -50,10 +50,10 @@ 
 	 */
 	private $registration_table;
 
-    /**
-     * @var string
-     */
-    private $root_path;
+	/**
+	 * @var string
+	 */
+	private $root_path;
 
 	/**
 	 * @var \paul999\u2f\U2F
@@ -65,22 +65,22 @@ 
 	 */
 	private $reg_data;
 
-    /**
-     * u2f constructor.
-     * @param driver_interface $db
-     * @param user $user
-     * @param request_interface $request
-     * @param template $template
-     * @param string $registration_table
-     * @param string $root_path
-     */
+	/**
+	 * u2f constructor.
+	 * @param driver_interface $db
+	 * @param user $user
+	 * @param request_interface $request
+	 * @param template $template
+	 * @param string $registration_table
+	 * @param string $root_path
+	 */
 	public function __construct(driver_interface $db, user $user, request_interface $request, template $template, $registration_table, $root_path)
 	{
 		$this->db       = $db;
 		$this->user     = $user;
 		$this->request  = $request;
 		$this->template = $template;
-        $this->root_path= $root_path;
+		$this->root_path= $root_path;
 
 		$this->registration_table	= $registration_table;
 
@@ -288,7 +288,7 @@ 
 	/**
 	 * Start of registration
 	 * @return string
-     */
+	 */
 	public function register_start()
 	{
 		$data = $this->u2f->getRegisterData($this->reg_data);
@@ -318,13 +318,13 @@ 
 			'U2F_SIGN'          => json_encode($data[1], JSON_UNESCAPED_SLASHES),
 		));
 
-        return 'tfa_u2f_ucp_new';
+		return 'tfa_u2f_ucp_new';
 	}
 
 	/**
 	 * Actual registration
 	 * @return void
-     * @throws BadRequestHttpException
+	 * @throws BadRequestHttpException
 	 */
 	public function register()
 	{
@@ -374,7 +374,7 @@ 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$this->template->assign_block_vars('keys', array(
-			    'CLASS'         => 'u2f',
+				'CLASS'         => 'u2f',
 				'ID'            => $row['registration_id'],
 				'REGISTERED'    => $this->user->format_date($row['registered']),
 				'LAST_USED'     => $this->user->format_date($row['last_used']),
@@ -411,24 +411,24 @@ 
 		}
 	}
 
-    /**
-     * If this module can add new keys (Or other things)
-     *
-     * @return boolean
-     */
-    public function can_register()
-    {
-        return $this->is_potentially_usable(false);
-    }
-
-    /**
-     * Get a language key for this specific module.
-     * @return string
-     */
-    public function get_translatable_name()
-    {
-        return 'MODULE_U2F';
-    }
+	/**
+	 * If this module can add new keys (Or other things)
+	 *
+	 * @return boolean
+	 */
+	public function can_register()
+	{
+		return $this->is_potentially_usable(false);
+	}
+
+	/**
+	 * Get a language key for this specific module.
+	 * @return string
+	 */
+	public function get_translatable_name()
+	{
+		return 'MODULE_U2F';
+	}
 
 	/**
 	 * Select all registration objects from the database

Spacing +21 added lines, -21 removed lines

@@ -80,11 +80,11 @@ 
 		$this->user     = $user;
 		$this->request  = $request;
 		$this->template = $template;
-        $this->root_path= $root_path;
+        $this->root_path = $root_path;
 
-		$this->registration_table	= $registration_table;
+		$this->registration_table = $registration_table;
 
-		$this->u2f = new \paul999\u2f\U2F('https://' . $this->request->server('HTTP_HOST'));
+		$this->u2f = new \paul999\u2f\U2F('https://'.$this->request->server('HTTP_HOST'));
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 			return false;
 		}
 		$sql = 'SELECT COUNT(registration_id) as reg_id 
-					FROM ' . $this->registration_table . ' 
+					FROM ' . $this->registration_table.' 
 					WHERE 
 						user_id = ' . (int) $user_id;
 		$result = $this->db->sql_query($sql);
@@ -138,7 +138,7 @@ 
 	 */
 	public function is_potentially_usable($user_id = false)
 	{
-		$browsercap = new Browscap($this->root_path . 'cache/');
+		$browsercap = new Browscap($this->root_path.'cache/');
 		$info = $browsercap->getBrowser();
 		return $info['Browser'] === 'chrome' && $this->is_ssl();
 	}
@@ -191,9 +191,9 @@ 
 			'u2f_request'	=> $registrations
 		);
 
-		$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+		$sql = 'UPDATE '.SESSIONS_TABLE.' SET '.$this->db->sql_build_array('UPDATE', $sql_ary).'
 					WHERE
-						session_id = \'' . $this->db->sql_escape($this->user->data['session_id']) . '\' AND
+						session_id = \'' . $this->db->sql_escape($this->user->data['session_id']).'\' AND
 						session_user_id = ' . (int) $this->user->data['user_id'];
 		$this->db->sql_query($sql);
 		$count = $this->db->sql_affectedrows();
@@ -204,9 +204,9 @@ 
 			{
 				// Reset sessions table. We had multiple sessions with same ID!!!
 				$sql_ary['u2f_request'] = '';
-				$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				$sql = 'UPDATE '.SESSIONS_TABLE.' SET '.$this->db->sql_build_array('UPDATE', $sql_ary).'
 					WHERE
-						session_id = \'' . $this->db->sql_escape($this->user->data['session_id']) . '\' AND
+						session_id = \'' . $this->db->sql_escape($this->user->data['session_id']).'\' AND
 						session_user_id = ' . (int) $this->user->data['user_id'];
 				$this->db->sql_query($sql);
 			}
@@ -226,9 +226,9 @@ 
 		try
 		{
 			$sql = 'SELECT u2f_request 
-						FROM ' . SESSIONS_TABLE . ' 
+						FROM ' . SESSIONS_TABLE.' 
 						WHERE
-							session_id = \'' . $this->db->sql_escape($this->user->data['session_id']) . '\' AND
+							session_id = \'' . $this->db->sql_escape($this->user->data['session_id']).'\' AND
 							session_user_id = ' . (int) $this->user->data['user_id'];
 			$result = $this->db->sql_query($sql);
 			$row = $this->db->sql_fetchrow($result);
@@ -258,7 +258,7 @@ 
 				'last_used' => time(),
 			);
 
-			$sql = 'UPDATE ' . $this->registration_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE registration_id = ' . (int) $reg->getId();
+			$sql = 'UPDATE '.$this->registration_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_ary).' WHERE registration_id = '.(int) $reg->getId();
 			$this->db->sql_query($sql);
 		}
 		catch (U2fError $error)
@@ -267,7 +267,7 @@ 
 		}
 		catch (\InvalidArgumentException $invalid)
 		{
-			throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG') . '<br />' . $invalid->getMessage(), $invalid);
+			throw new BadRequestHttpException($this->user->lang('TFA_SOMETHING_WENT_WRONG').'<br />'.$invalid->getMessage(), $invalid);
 		}
 	}
 
@@ -342,7 +342,7 @@ 
 				'last_used' => time(),
 			);
 
-			$sql = 'INSERT INTO ' . $this->registration_table . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+			$sql = 'INSERT INTO '.$this->registration_table.' '.$this->db->sql_build_array('INSERT', $sql_ary);
 			$this->db->sql_query($sql);
 
 			$sql_ary = array(
@@ -364,8 +364,8 @@ 
 	public function show_ucp()
 	{
 		$sql = 'SELECT *
-			FROM ' . $this->registration_table . '
-			WHERE user_id = ' . (int) $this->user->data['user_id'] . '
+			FROM ' . $this->registration_table.'
+			WHERE user_id = ' . (int) $this->user->data['user_id'].'
 			ORDER BY registration_id ASC';
 
 		$result = $this->db->sql_query($sql);
@@ -403,8 +403,8 @@ 
 		if (isset($data['keys']))
 		{
 			$sql_where = $this->db->sql_in_set('registration_id', $data['keys']);
-			$sql = 'DELETE FROM ' . $this->registration_table . '
-												WHERE user_id = ' . (int) $this->user->data['user_id'] . '
+			$sql = 'DELETE FROM '.$this->registration_table.'
+												WHERE user_id = ' . (int) $this->user->data['user_id'].'
 												AND ' . $sql_where;
 
 			$this->db->sql_query($sql);
@@ -437,7 +437,7 @@ 
 	 */
 	private function getRegistrations($user_id)
 	{
-		$sql = 'SELECT * FROM ' . $this->registration_table . ' WHERE user_id = ' . (int) $user_id;
+		$sql = 'SELECT * FROM '.$this->registration_table.' WHERE user_id = '.(int) $user_id;
 		$result = $this->db->sql_query($sql);
 		$rows = array();
 
@@ -525,9 +525,9 @@ 
 	 */
 	private function update_session($sql_ary)
 	{
-		$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+		$sql = 'UPDATE '.SESSIONS_TABLE.' SET '.$this->db->sql_build_array('UPDATE', $sql_ary).'
 							WHERE
-								session_id = \'' . $this->db->sql_escape($this->user->data['session_id']) . '\' AND
+								session_id = \'' . $this->db->sql_escape($this->user->data['session_id']).'\' AND
 								session_user_id = ' . (int) $this->user->data['user_id'];
 		$this->db->sql_query($sql);
 

helper/session_helper.php

Indentation +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
 			return $this->user_array[$user_id];
 		}
 
-        $this->user_array[$user_id] = false; // Preset to false.
+		$this->user_array[$user_id] = false; // Preset to false.
 
 		/**
 		 * @var int $priority