hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add safety checks to saving accounts, remove debug

Browse Source
This commit is contained in:
VortrexFTW
2020-09-06 00:15:30 -05:00
parent 1a17795a69
commit 13a5474cc6
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/server/account.js
View File

@@ -416,7 +416,6 @@ function saveAccountToDatabase(accountData) {
//let safeIRCAccount = dbConnection.escapeString(accountData.ircAccount); //let safeIRCAccount = dbConnection.escapeString(accountData.ircAccount);
let dbQueryString = `UPDATE acct_main SET acct_pass='${safePassword}', acct_settings=${accountData.settings}, acct_staff_flags=${accountData.flags.admin}, acct_staff_title='${safeStaffTitle}', acct_mod_flags=${String(accountData.flags.moderation)}, acct_discord=${String(accountData.discordAccount)}, acct_email='${safeEmailAddress}' WHERE acct_id=${accountData.databaseId}`; let dbQueryString = `UPDATE acct_main SET acct_pass='${safePassword}', acct_settings=${accountData.settings}, acct_staff_flags=${accountData.flags.admin}, acct_staff_title='${safeStaffTitle}', acct_mod_flags=${String(accountData.flags.moderation)}, acct_discord=${String(accountData.discordAccount)}, acct_email='${safeEmailAddress}' WHERE acct_id=${accountData.databaseId}`;
console.log(dbQueryString);
let dbQuery = dbConnection.query(dbQueryString); let dbQuery = dbConnection.query(dbQueryString);
//dbQuery.free(); //dbQuery.free();
disconnectFromDatabase(dbConnection); disconnectFromDatabase(dbConnection);
@@ -687,17 +686,24 @@ function saveAllClientsToDatabase() {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function saveClientToDatabase(client) { function saveClientToDatabase(client) {
if(getClientData(client) == null) {
return false;
}
if(!getClientData(client).loggedIn) {
return false;
}
console.log("[Asshat.Account]: Saving client " + String(client.name) + " to database ..."); console.log("[Asshat.Account]: Saving client " + String(client.name) + " to database ...");
saveAccountToDatabase(getClientData(client).accountData); saveAccountToDatabase(getClientData(client).accountData);
console.log("acct done");
let subAccountData = getClientCurrentSubAccount(client); let subAccountData = getClientCurrentSubAccount(client);
console.log("sacct got");
subAccountData.spawnPosition = client.player.position; if(client.player) {
console.log("sacct pos"); subAccountData.spawnPosition = client.player.position;
subAccountData.spawnHeading = client.player.heading; subAccountData.spawnHeading = client.player.heading;
console.log("sacct start"); }
saveSubAccountToDatabase(subAccountData); saveSubAccountToDatabase(subAccountData);
console.log("sacct done");
console.log("[Asshat.Account]: Saved client " + String(client.name) + " to database successfully!"); console.log("[Asshat.Account]: Saved client " + String(client.name) + " to database successfully!");
return true; return true;
} }