paul999 / phpbb_2fa

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()
 	{

Spacing +10 added lines, -10 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'));
 	}
@@ -201,7 +201,7 @@ 
 		{
 			$sql = 'SELECT u2f_request FROM ' . SESSIONS_TABLE . ' WHERE
 				session_id = \'' . $this->db->sql_escape($this->user->data['session_id']) . '\' AND
-				session_user_id = ' . (int)$this->user->data['user_id'];
+				session_user_id = ' . (int) $this->user->data['user_id'];
 			$result = $this->db->sql_query($sql);
 			$row = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
@@ -230,7 +230,7 @@ 
 				'last_used' => time(),
 			);
 
-			$sql = 'UPDATE ' . $this->registration_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE registration_id = ' . (int)$reg->id;
+			$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)
@@ -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);
 	}
@@ -371,7 +371,7 @@ 
 		{
 			$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'] . '
+												WHERE user_id = ' . (int) $this->user->data['user_id'] . '
 												AND ' . $sql_where;
 
 			$this->db->sql_query($sql);
@@ -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);

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

ucp/tfa_module.php

Braces +3 added lines, -6 removed lines

@@ -101,13 +101,11 @@ 
 				meta_refresh(3, $this->u_action);
 				$message = $this->user->lang['TFA_KEY_ADDED'] . '<br /><br />' . sprintf($this->user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 				trigger_error($message);
-			}
-			else
+			} else
 			{
 				$error[] = $this->user->lang('TFA_MODULE_NOT_FOUND', $class);
 			}
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$error[] = $e->getMessage();
 		}
@@ -130,8 +128,7 @@ 
 			if (!check_form_key('ucp_tfa_keys'))
 			{
 				$error[] = 'FORM_INVALID';
-			}
-			else
+			} else
 			{
 				switch ($mode)
 				{