diff --git a/src/server/cyberhex-code/install/create_admin.php b/src/server/cyberhex-code/install/create_admin.php index 276ef9c..a48b091 100644 --- a/src/server/cyberhex-code/install/create_admin.php +++ b/src/server/cyberhex-code/install/create_admin.php @@ -49,7 +49,7 @@ $success=0; die("Connection failed: " . $conn->connect_error); } - $stmt = $conn->prepare("INSERT INTO users (email, username, password,perms,allow_pw_login) VALUES (?, ?, ?, ?,1)"); + $stmt = $conn->prepare("INSERT INTO users (email, username, password,perms,allow_pw_login,send_login_message,use_2fa) VALUES (?, ?, ?, ?,1,0,0)"); $stmt->bind_param("ssss", $email, $username, $hash, $permissions); $email=htmlspecialchars($_POST["email"]); diff --git a/src/server/cyberhex-code/install/create_db.php b/src/server/cyberhex-code/install/create_db.php index 4523046..f0236ab 100644 --- a/src/server/cyberhex-code/install/create_db.php +++ b/src/server/cyberhex-code/install/create_db.php @@ -68,6 +68,7 @@ user_hex_id VARCHAR(255), credential_id VARBINARY(64), allow_pw_login INT, + use_2fa INT, send_login_message INT, public_key TEXT, counter INT diff --git a/src/server/cyberhex-code/system/insecure_zone/php/login.php b/src/server/cyberhex-code/system/insecure_zone/php/login.php index f87e72f..957f0f1 100644 --- a/src/server/cyberhex-code/system/insecure_zone/php/login.php +++ b/src/server/cyberhex-code/system/insecure_zone/php/login.php @@ -304,6 +304,8 @@ async function checkRegistration() { $_SESSION["telegram_id"]=$row["telegram_id"]; $_SESSION["allow_pw_login"]=$row["allow_pw_login"]; $_SESSION["send_login_message"]=$row["send_login_message"]; + $_SESSION["use_2fa"]=$row["use_2fa"]; + if($_SESSION["send_login_message"]=="1"){ $ip = $_SERVER['REMOTE_ADDR']; $username=$row["username"]; diff --git a/src/server/cyberhex-code/system/insecure_zone/php/login_backend.php b/src/server/cyberhex-code/system/insecure_zone/php/login_backend.php index 40acd50..bb95a5a 100644 --- a/src/server/cyberhex-code/system/insecure_zone/php/login_backend.php +++ b/src/server/cyberhex-code/system/insecure_zone/php/login_backend.php @@ -178,6 +178,7 @@ try { $_SESSION["telegram_id"]=$row["telegram_id"]; $_SESSION["allow_pw_login"]=$row["allow_pw_login"]; $_SESSION["send_login_message"]=$row["send_login_message"]; + $_SESSION["use_2fa"]=$row["use_2fa"]; if($_SESSION["send_login_message"]=="1"){ $ip = $_SERVER['REMOTE_ADDR']; $username=$row["username"]; diff --git a/src/server/cyberhex-code/system/secure_zone/php/add_user.php b/src/server/cyberhex-code/system/secure_zone/php/add_user.php index e73e660..0b01fac 100644 --- a/src/server/cyberhex-code/system/secure_zone/php/add_user.php +++ b/src/server/cyberhex-code/system/secure_zone/php/add_user.php @@ -156,7 +156,7 @@ include "perms_functions.php"; $success=0; die("Connection failed: " . $conn->connect_error); } - $stmt = $conn->prepare("INSERT INTO users (email, username, password,perms,allow_pw_login) VALUES (?, ?, ?, ?,1)"); + $stmt = $conn->prepare("INSERT INTO users (email, username, password,perms,allow_pw_login,send_login_message,use_2fa) VALUES (?, ?, ?, ?,1,0,0)"); $stmt->bind_param("ssss", $email, $username, $hash, $permissions); $email=htmlspecialchars($_POST["email"]); diff --git a/src/server/cyberhex-code/system/secure_zone/php/profile.php b/src/server/cyberhex-code/system/secure_zone/php/profile.php index 8fa1bc9..6beaf2a 100644 --- a/src/server/cyberhex-code/system/secure_zone/php/profile.php +++ b/src/server/cyberhex-code/system/secure_zone/php/profile.php @@ -94,7 +94,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { echo(""); } ?> - +
@@ -105,7 +105,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { echo(""); } ?> - +