Remove display names
This commit is contained in:
1 parent
c754df44c3
commit
b7271bf6d2
11 files changed
+17
-131
No files matched your search
@@ -80,7 +80,6 @@ CREATE TABLE `uploads` (
|
|||||||
CREATE TABLE `users` (
|
CREATE TABLE `users` (
|
||||||
`uid` int NOT NULL,
|
`uid` int NOT NULL,
|
||||||
`username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 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,
|
`password` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
|
||||||
`email` varchar(255) 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,
|
`discord_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
<?php
|
|
||||||
require '../config/config.php';
|
|
||||||
require '../incl/main.php';
|
|
||||||
|
|
||||||
$old_displayname = $_POST['olddisplayname'] ?? '';
|
|
||||||
$new_displayname = $_POST['newdisplayname'] ?? '';
|
|
||||||
$username = $_POST['username'] ?? '';
|
|
||||||
$password = $_POST['password'] ??'';
|
|
||||||
|
|
||||||
if (empty($username) || empty($old_displayname) || empty($new_displayname) || empty($password)) {
|
|
||||||
http_response_code(400);
|
|
||||||
header('Content-Type: application/json');
|
|
||||||
die(json_encode(['success' => '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();
|
|
||||||
?>
|
|
||||||
@@ -103,7 +103,7 @@ $stmt->close();
|
|||||||
|
|
||||||
$fileUrl = "https://files.upload.xytriza.com/{$file}";
|
$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->bind_param("s", $uid);
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
$stmt->bind_result($username, $timezone);
|
$stmt->bind_result($username, $timezone);
|
||||||
|
|||||||
@@ -64,7 +64,6 @@ if ($result->num_rows > 0) {
|
|||||||
$info = [
|
$info = [
|
||||||
'uid' => $userInfo['uid'],
|
'uid' => $userInfo['uid'],
|
||||||
'username' => $userInfo['username'],
|
'username' => $userInfo['username'],
|
||||||
'displayName' => $userInfo['display_name'] ?? $userInfo['username'],
|
|
||||||
'discordId' => $userInfo['discord_id'],
|
'discordId' => $userInfo['discord_id'],
|
||||||
'role' => $role,
|
'role' => $role,
|
||||||
'registerTime' => $userInfo['register_time'],
|
'registerTime' => $userInfo['register_time'],
|
||||||
@@ -73,7 +72,7 @@ if ($result->num_rows > 0) {
|
|||||||
|
|
||||||
$response = [
|
$response = [
|
||||||
'success' => true,
|
'success' => true,
|
||||||
'response' => 'Information for user "' . $userInfo['display_name'] . '"',
|
'response' => 'Information for user "' . $userInfo['username'] . '"',
|
||||||
'userinfo' => $info,
|
'userinfo' => $info,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ if ($conn->connect_error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$request_username = $_POST['username'] ?? '';
|
$request_username = $_POST['username'] ?? '';
|
||||||
$request_displayname = (isset($_POST['displayname']) && !empty($_POST['displayname'])) ? $_POST['displayname'] : $request_username;
|
|
||||||
$request_password = $_POST['password'] ?? '';
|
$request_password = $_POST['password'] ?? '';
|
||||||
$request_email = $_POST['email'] ?? '';
|
$request_email = $_POST['email'] ?? '';
|
||||||
|
|
||||||
@@ -114,13 +113,6 @@ if (strlen($request_username) < 3 || strlen($request_username) > 32) {
|
|||||||
exit;
|
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) {
|
function generateRandomString($length) {
|
||||||
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
|
||||||
$randomString = '';
|
$randomString = '';
|
||||||
@@ -223,8 +215,8 @@ if ($result->num_rows > 0) {
|
|||||||
echo json_encode($response);
|
echo json_encode($response);
|
||||||
}
|
}
|
||||||
|
|
||||||
$stmt = $conn->prepare("INSERT INTO users (username, display_name, password, email, api_key, emailconfirm, register_time) VALUES (?, ?, ?, ?, ?, ?, ?)");
|
$stmt = $conn->prepare("INSERT INTO users (username, 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->bind_param("ssssssi", $request_username, $hashed_password, $request_email, $api_key, $emailconfirm, time());
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
|
|
||||||
$response = [
|
$response = [
|
||||||
|
|||||||
@@ -16,15 +16,13 @@ if (!checkUserSession($conn)) {
|
|||||||
|
|
||||||
$session = htmlspecialchars($_COOKIE['session']);
|
$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->bind_param("s", $session);
|
||||||
$stmt->execute();
|
$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->fetch();
|
||||||
$stmt->close();
|
$stmt->close();
|
||||||
|
|
||||||
$displayname = htmlspecialchars($displayname, ENT_QUOTES, 'UTF-8') ?? $username;
|
|
||||||
|
|
||||||
$conn->close();
|
$conn->close();
|
||||||
|
|
||||||
checkDiscordLink($discord_id);
|
checkDiscordLink($discord_id);
|
||||||
@@ -69,7 +67,6 @@ $role_format = $role == 1 ? "Owner" : ($role == 2 ? "Admin" : ($role == 0 ? "Use
|
|||||||
<div id="account-information" class="section">
|
<div id="account-information" class="section">
|
||||||
<h2>Account Information</h2>
|
<h2>Account Information</h2>
|
||||||
<p id="username"><strong>Username:</strong> <?php echo $username;?></p>
|
<p id="username"><strong>Username:</strong> <?php echo $username;?></p>
|
||||||
<p id="displayname"><strong>Display Name:</strong> <?php echo $displayname;?></p>
|
|
||||||
<p><strong>UID:</strong> <?php echo $uid;?></p>
|
<p><strong>UID:</strong> <?php echo $uid;?></p>
|
||||||
<p><strong>Discord ID:</strong> <?php echo $discord_id;?></p>
|
<p><strong>Discord ID:</strong> <?php echo $discord_id;?></p>
|
||||||
<p><strong>Email:</strong> <em class="blur-on-hover"><?php echo $email;?></em></p>
|
<p><strong>Email:</strong> <em class="blur-on-hover"><?php echo $email;?></em></p>
|
||||||
@@ -90,7 +87,7 @@ $role_format = $role == 1 ? "Owner" : ($role == 2 ? "Admin" : ($role == 0 ? "Use
|
|||||||
<input type="password" id="oldPassword" placeholder="Old Password">
|
<input type="password" id="oldPassword" placeholder="Old Password">
|
||||||
<input type="password" id="newPassword" placeholder="New Password">
|
<input type="password" id="newPassword" placeholder="New Password">
|
||||||
<input type="password" id="confirmPassword" placeholder="Confirm New Password">
|
<input type="password" id="confirmPassword" placeholder="Confirm New Password">
|
||||||
<input type="hidden" id="username" value="<?php echo $displayname;?>">
|
<input type="hidden" id="username" value="<?php echo $username;?>">
|
||||||
<button type="submit">Change Password</button>
|
<button type="submit">Change Password</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
@@ -105,14 +102,6 @@ $role_format = $role == 1 ? "Owner" : ($role == 2 ? "Admin" : ($role == 0 ? "Use
|
|||||||
<input type="password" id="usernamepassword" placeholder="Password">
|
<input type="password" id="usernamepassword" placeholder="Password">
|
||||||
<button type="submit">Change Username</button>
|
<button type="submit">Change Username</button>
|
||||||
</form>
|
</form>
|
||||||
<h2>Change Display Name</h2>
|
|
||||||
<form id="displaynameChangeForm">
|
|
||||||
<input type="text" id="newDisplayname" placeholder="New Display Name">
|
|
||||||
<input type="hidden" id="oldDisplayname" value="<?php echo $displayname;?>">
|
|
||||||
<input type="hidden" id="username" value="<?php echo $username;?>">
|
|
||||||
<input type="password" id="displayusernamepassword" placeholder="Password">
|
|
||||||
<button type="submit">Change Display Name</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="user-settings" class="section half-width">
|
<div id="user-settings" class="section half-width">
|
||||||
|
|||||||
@@ -108,7 +108,6 @@ function getRole($role) {
|
|||||||
echo "<tr>";
|
echo "<tr>";
|
||||||
echo "<td>" . (!empty($row['uid']) ? htmlspecialchars($row['uid']) : "N/A") . "</td>";
|
echo "<td>" . (!empty($row['uid']) ? htmlspecialchars($row['uid']) : "N/A") . "</td>";
|
||||||
echo "<td>" . (!empty($row['username']) ? htmlspecialchars($row['username']) : "N/A") . "</td>";
|
echo "<td>" . (!empty($row['username']) ? htmlspecialchars($row['username']) : "N/A") . "</td>";
|
||||||
echo "<td>" . (!empty($row['display_name']) ? htmlspecialchars($row['display_name']) : "N/A") . "</td>";
|
|
||||||
if ($row['role'] != 0 || $role != 1) {
|
if ($row['role'] != 0 || $role != 1) {
|
||||||
echo "<td>Hidden</td>";
|
echo "<td>Hidden</td>";
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -424,11 +424,17 @@ input:checked~.icon-times {
|
|||||||
.tool-box {
|
.tool-box {
|
||||||
width: 6.67vw;
|
width: 6.67vw;
|
||||||
height: 6.67vw;
|
height: 6.67vw;
|
||||||
background-color: #333;
|
background-color: #3c076e;
|
||||||
border-radius: 0.42vw;
|
border-radius: 0.42vw;
|
||||||
padding: 0.26vw;
|
padding: 0.26vw;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
margin: 0.26vw;
|
margin: 0.26vw;
|
||||||
|
transition: background-color 0.3s, transform 0.3s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tool-box:hover {
|
||||||
|
background-color: #370664;
|
||||||
|
transform: scale(1.05);
|
||||||
}
|
}
|
||||||
|
|
||||||
.tool-title {
|
.tool-title {
|
||||||
|
|||||||
@@ -141,8 +141,7 @@ document.addEventListener('DOMContentLoaded', (event) => {
|
|||||||
|
|
||||||
element1 = document.getElementById('passwordChangeForm');
|
element1 = document.getElementById('passwordChangeForm');
|
||||||
element2 = document.getElementById('usernameChangeForm');
|
element2 = document.getElementById('usernameChangeForm');
|
||||||
element3 = document.getElementById('displaynameChangeForm');
|
if (element1 && element2) {
|
||||||
if (element1 && element2 && element3) {
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$('#passwordChangeForm').on('submit', function(e) {
|
$('#passwordChangeForm').on('submit', function(e) {
|
||||||
e.preventDefault();
|
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('<strong>Username:</strong> ').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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ if (!checkUserSession($conn)) {
|
|||||||
|
|
||||||
$session = htmlspecialchars($_COOKIE['session']);
|
$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->bind_param("s", $session);
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
$stmt->bind_result($uid, $username, $email, $api_key, $role, $discord_id);
|
$stmt->bind_result($uid, $username, $email, $api_key, $role, $discord_id);
|
||||||
|
|||||||
@@ -96,7 +96,6 @@ if (isset($_COOKIE['session'])) {
|
|||||||
<p>Please create an account to continue</p>
|
<p>Please create an account to continue</p>
|
||||||
<form id="loginForm">
|
<form id="loginForm">
|
||||||
<input type="text" id="email" placeholder="Email" required>
|
<input type="text" id="email" placeholder="Email" required>
|
||||||
<input type="text" id="displayname" placeholder="Display Name (optional)">
|
|
||||||
<input type="text" id="username" placeholder="Username" required>
|
<input type="text" id="username" placeholder="Username" required>
|
||||||
<input type="password" id="password" placeholder="Password" required>
|
<input type="password" id="password" placeholder="Password" required>
|
||||||
<div class="cf-turnstile" data-sitekey="<?= $captcha_sitekey ?>" data-callback="javascriptCallback"></div>
|
<div class="cf-turnstile" data-sitekey="<?= $captcha_sitekey ?>" data-callback="javascriptCallback"></div>
|
||||||
@@ -127,14 +126,13 @@ if (isset($_COOKIE['session'])) {
|
|||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
var email = $('#email').val();
|
var email = $('#email').val();
|
||||||
var displayname = $('#displayname').val();
|
|
||||||
var username = $('#username').val();
|
var username = $('#username').val();
|
||||||
var password = $('#password').val();
|
var password = $('#password').val();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: '../../api/registerAccount.php',
|
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) {
|
success: function (data, textStatus, xhr) {
|
||||||
console.log(data, xhr.status);
|
console.log(data, xhr.status);
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in new issue
Block a user