diff --git a/database.sql b/database.sql index c18cf94..e03ab89 100644 --- a/database.sql +++ b/database.sql @@ -80,7 +80,6 @@ CREATE TABLE `uploads` ( CREATE TABLE `users` ( `uid` int NOT NULL, `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `display_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `password` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `discord_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, diff --git a/webroot/api/changeDisplayname.php b/webroot/api/changeDisplayname.php deleted file mode 100644 index 38066b1..0000000 --- a/webroot/api/changeDisplayname.php +++ /dev/null @@ -1,60 +0,0 @@ - 'false', 'response' => 'Missing Username, Old Display Name, New Display Name, or Password'])); -} - -if (strlen($new_displayname) < 3 || strlen($new_displayname) > 32) { - http_response_code(400); - header('Content-Type: application/json'); - die(json_encode(['success' => 'false', 'responsae' => 'New Display Name must be between 3 and 32 characters'])); -} - -$conn = new mysqli($dbservername, $dbusername, $dbpassword, $dbname); - -if ($conn->connect_error) { - http_response_code(500); - header('Content-Type: application/json'); - die(json_encode(['success' => 'false', 'response' => 'Unable to access database'])); -} - -$stmt = $conn->prepare("SELECT password FROM users WHERE username = ?"); -$stmt->bind_param("s", $username); - -$stmt->execute(); - -$result = $stmt->get_result(); - -if ($result->num_rows > 0) { - $user = $result->fetch_assoc(); - - if (!password_verify($password, $user['password'])) { - http_response_code(400); - header('Content-Type: application/json'); - die(json_encode(['success' => 'false', 'response' => 'Password is incorrect'])); - } - - $stmt = $conn->prepare("UPDATE users SET display_name = ? WHERE username = ?"); - $stmt->bind_param("ss", $new_displayname, $username); - $stmt->execute(); - - http_response_code(200); - header('Content-Type: application/json'); - echo json_encode(['success' => 'true', 'response' => 'Display Name changed successfully']); -} else { - http_response_code(404); - header('Content-Type: application/json'); - die(json_encode(['success' => 'false', 'response' => 'User not found'])); -} -$stmt->close(); -$conn->close(); -?> \ No newline at end of file diff --git a/webroot/api/fetchFile.php b/webroot/api/fetchFile.php index b5a04d0..6fc27fa 100644 --- a/webroot/api/fetchFile.php +++ b/webroot/api/fetchFile.php @@ -103,7 +103,7 @@ $stmt->close(); $fileUrl = "https://files.upload.xytriza.com/{$file}"; -$stmt = $conn->prepare("SELECT display_name, timezone FROM users WHERE uid = ?"); +$stmt = $conn->prepare("SELECT username, timezone FROM users WHERE uid = ?"); $stmt->bind_param("s", $uid); $stmt->execute(); $stmt->bind_result($username, $timezone); diff --git a/webroot/api/getUserInfo.php b/webroot/api/getUserInfo.php index 2b3b9eb..7f9d35b 100644 --- a/webroot/api/getUserInfo.php +++ b/webroot/api/getUserInfo.php @@ -64,7 +64,6 @@ if ($result->num_rows > 0) { $info = [ 'uid' => $userInfo['uid'], 'username' => $userInfo['username'], - 'displayName' => $userInfo['display_name'] ?? $userInfo['username'], 'discordId' => $userInfo['discord_id'], 'role' => $role, 'registerTime' => $userInfo['register_time'], @@ -73,7 +72,7 @@ if ($result->num_rows > 0) { $response = [ 'success' => true, - 'response' => 'Information for user "' . $userInfo['display_name'] . '"', + 'response' => 'Information for user "' . $userInfo['username'] . '"', 'userinfo' => $info, ]; diff --git a/webroot/api/registerAccount.php b/webroot/api/registerAccount.php index b160d30..524bd91 100644 --- a/webroot/api/registerAccount.php +++ b/webroot/api/registerAccount.php @@ -63,7 +63,6 @@ if ($conn->connect_error) { } $request_username = $_POST['username'] ?? ''; -$request_displayname = (isset($_POST['displayname']) && !empty($_POST['displayname'])) ? $_POST['displayname'] : $request_username; $request_password = $_POST['password'] ?? ''; $request_email = $_POST['email'] ?? ''; @@ -114,13 +113,6 @@ if (strlen($request_username) < 3 || strlen($request_username) > 32) { exit; } -if (strlen($request_displayname) < 3 || strlen($request_displayname) > 32) { - http_response_code(400); - header('Content-Type: application/json'); - die(json_encode(['success' => 'false', 'response' => 'Display Name must be between 3 and 32 characters'])); - exit; -} - function generateRandomString($length) { $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; $randomString = ''; @@ -223,8 +215,8 @@ if ($result->num_rows > 0) { echo json_encode($response); } - $stmt = $conn->prepare("INSERT INTO users (username, display_name, password, email, api_key, emailconfirm, register_time) VALUES (?, ?, ?, ?, ?, ?, ?)"); - $stmt->bind_param("ssssssi", $request_username, $request_displayname, $hashed_password, $request_email, $api_key, $emailconfirm, time()); + $stmt = $conn->prepare("INSERT INTO users (username, password, email, api_key, emailconfirm, register_time) VALUES (?, ?, ?, ?, ?, ?)"); + $stmt->bind_param("ssssssi", $request_username, $hashed_password, $request_email, $api_key, $emailconfirm, time()); $stmt->execute(); $response = [ diff --git a/webroot/dashboard/account.php b/webroot/dashboard/account.php index 5c69b49..194109a 100644 --- a/webroot/dashboard/account.php +++ b/webroot/dashboard/account.php @@ -16,15 +16,13 @@ if (!checkUserSession($conn)) { $session = htmlspecialchars($_COOKIE['session']); -$stmt = $conn->prepare("SELECT uid, display_name, username, email, api_key, discord_id, role, discord_avatar FROM users WHERE session = ?"); +$stmt = $conn->prepare("SELECT uid, username, email, api_key, discord_id, role, discord_avatar FROM users WHERE session = ?"); $stmt->bind_param("s", $session); $stmt->execute(); -$stmt->bind_result($uid, $displayname, $username, $email, $api_key, $discord_id, $role, $avatar); +$stmt->bind_result($uid, $username, $email, $api_key, $discord_id, $role, $avatar); $stmt->fetch(); $stmt->close(); -$displayname = htmlspecialchars($displayname, ENT_QUOTES, 'UTF-8') ?? $username; - $conn->close(); checkDiscordLink($discord_id); @@ -69,7 +67,6 @@ $role_format = $role == 1 ? "Owner" : ($role == 2 ? "Admin" : ($role == 0 ? "Use

Account Information

Username:

-

Display Name:

UID:

Discord ID:

Email:

@@ -90,7 +87,7 @@ $role_format = $role == 1 ? "Owner" : ($role == 2 ? "Admin" : ($role == 0 ? "Use - +
@@ -105,14 +102,6 @@ $role_format = $role == 1 ? "Owner" : ($role == 2 ? "Admin" : ($role == 0 ? "Use -

Change Display Name

-
- - - - - -
diff --git a/webroot/dashboard/admin/users.php b/webroot/dashboard/admin/users.php index 26c7f46..f98205c 100644 --- a/webroot/dashboard/admin/users.php +++ b/webroot/dashboard/admin/users.php @@ -108,7 +108,6 @@ function getRole($role) { echo ""; echo "" . (!empty($row['uid']) ? htmlspecialchars($row['uid']) : "N/A") . ""; echo "" . (!empty($row['username']) ? htmlspecialchars($row['username']) : "N/A") . ""; - echo "" . (!empty($row['display_name']) ? htmlspecialchars($row['display_name']) : "N/A") . ""; if ($row['role'] != 0 || $role != 1) { echo "Hidden"; } else { diff --git a/webroot/dashboard/assets/main.css b/webroot/dashboard/assets/main.css index dbd26aa..132d18a 100644 --- a/webroot/dashboard/assets/main.css +++ b/webroot/dashboard/assets/main.css @@ -424,11 +424,17 @@ input:checked~.icon-times { .tool-box { width: 6.67vw; height: 6.67vw; - background-color: #333; + background-color: #3c076e; border-radius: 0.42vw; padding: 0.26vw; text-align: center; margin: 0.26vw; + transition: background-color 0.3s, transform 0.3s; +} + +.tool-box:hover { + background-color: #370664; + transform: scale(1.05); } .tool-title { diff --git a/webroot/dashboard/assets/main.js b/webroot/dashboard/assets/main.js index 5555e6c..cbc07d5 100644 --- a/webroot/dashboard/assets/main.js +++ b/webroot/dashboard/assets/main.js @@ -141,8 +141,7 @@ document.addEventListener('DOMContentLoaded', (event) => { element1 = document.getElementById('passwordChangeForm'); element2 = document.getElementById('usernameChangeForm'); - element3 = document.getElementById('displaynameChangeForm'); - if (element1 && element2 && element3) { + if (element1 && element2) { $(document).ready(function() { $('#passwordChangeForm').on('submit', function(e) { e.preventDefault(); @@ -209,41 +208,6 @@ document.addEventListener('DOMContentLoaded', (event) => { } }); }); - - $('#displaynameChangeForm').on('submit', function(e) { - e.preventDefault(); - var oldUsername = $('#oldDisplayname').val(); - var newUsername = $('#newDisplayname').val(); - var username = $('#username').val(); - var password = $('#displayusernamepassword').val(); - $.ajax({ - url: '/api/changeDisplayname.php', - type: 'POST', - data: { - olddisplayname: oldUsername, - newdisplayname: newUsername, - username: username, - password: password - }, - success: function(data) { - response = data; - if (response.success) { - showSuccess(response.response); - $('#oldDisplayname').val(newUsername); - $('#displayname').html('Username: ').append(document.createTextNode(newUsername)); - } else { - showError(response.response); - } - }, - error: function(jqXHR) { - if (jqXHR.responseJSON && jqXHR.responseJSON.response) { - showError(jqXHR.responseJSON.response); - } else { - showError(jqXHR.responseText); - } - } - }); - }); }); } }); diff --git a/webroot/dashboard/index.php b/webroot/dashboard/index.php index 719bb9e..fc88fae 100644 --- a/webroot/dashboard/index.php +++ b/webroot/dashboard/index.php @@ -16,7 +16,7 @@ if (!checkUserSession($conn)) { $session = htmlspecialchars($_COOKIE['session']); -$stmt = $conn->prepare("SELECT uid, display_name, email, api_key, role, discord_id FROM users WHERE session = ?"); +$stmt = $conn->prepare("SELECT uid, username, email, api_key, role, discord_id FROM users WHERE session = ?"); $stmt->bind_param("s", $session); $stmt->execute(); $stmt->bind_result($uid, $username, $email, $api_key, $role, $discord_id); diff --git a/webroot/dashboard/register.php b/webroot/dashboard/register.php index 14cb7e4..2789487 100644 --- a/webroot/dashboard/register.php +++ b/webroot/dashboard/register.php @@ -96,7 +96,6 @@ if (isset($_COOKIE['session'])) {

Please create an account to continue

-
@@ -127,14 +126,13 @@ if (isset($_COOKIE['session'])) { event.preventDefault(); var email = $('#email').val(); - var displayname = $('#displayname').val(); var username = $('#username').val(); var password = $('#password').val(); $.ajax({ type: "POST", url: '../../api/registerAccount.php', - data: { email: email, displayname: displayname, username: username, password: password, captcha_token: captcha_token }, + data: { email: email, username: username, password: password, captcha_token: captcha_token }, success: function (data, textStatus, xhr) { console.log(data, xhr.status); try {