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

Fix clan save func, add missing logic

Browse Source
This commit is contained in:
Vortrex
2021-07-25 22:12:08 -05:00
parent 67cef06f6d
commit 2f18948763
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/server/clan.js
View File

@@ -535,7 +535,7 @@ function createClan(name) {
if(dbConnection) { if(dbConnection) {
escapedName = escapeDatabaseString(dbConnection, escapedName) escapedName = escapeDatabaseString(dbConnection, escapedName)
queryDatabase(dbConnection, `INSERT INTO clan_main (clan_server, clan_name) VALUES (${getServerId()}, '${escapedName}')`); queryDatabase(dbConnection, `INSERT INTO clan_main (clan_server, clan_name) VALUES (${getServerId()}, '${escapedName}')`);
let tempClan = new serverClasses.clanData();
tempClan.databaseId = getDatabaseInsertId(dbConnection); tempClan.databaseId = getDatabaseInsertId(dbConnection);
tempClan.name = name; tempClan.name = name;
getServerData().clans.push(tempClan); getServerData().clans.push(tempClan);
@@ -566,13 +566,9 @@ function deleteClan(clanId) {
// =========================================================================== // ===========================================================================
function getClanData(clanId) { function getClanData(clanId) {
let clans = getServerData().clans; if(typeof getServerData().clans[clanId] != null) {
for(let i in clans) { return getServerData().clans[clanId];
if(clans[i].databaseId == clanId) {
return clans[i];
}
} }
return false; return false;
} }
@@ -622,11 +618,23 @@ function saveClansToDatabase() {
function saveClanToDatabase(clanData) { function saveClanToDatabase(clanData) {
let dbConnection = connectToDatabase(); let dbConnection = connectToDatabase();
if(dbConnection) { if(dbConnection) {
let safeClanName = escapeDatabaseString(dbConnection, clanData.name); let safeName = escapeDatabaseString(dbConnection, clanData.name);
let dbQueryString = `UPDATE clan_main SET clan_name = '${safeClanName}', clan_owner = ${clanData.ownerId} WHERE clan_id = ${clanData.databaseId}`; let safeTag = escapeDatabaseString(dbConnection, clanData.tag);
let safeMOTD = escapeDatabaseString(dbConnection, clanData.motd);
let dbQueryString = `
UPDATE clan_main SET
clan_name='${safeName}',
clan_owner=${clanData.ownerId},
clan_tag='${safeTag}',
clan_motd='${safeMOTD}',
WHERE clan_id=${clanData.databaseId}`;
//dbQueryString = dbQueryString.trim();
dbQueryString = dbQueryString.replace(/(?:\r\n|\r|\n|\t)/g, "");
let dbQuery = queryDatabase(dbConnection, dbQueryString); let dbQuery = queryDatabase(dbConnection, dbQueryString);
freeDatabaseQuery(dbQuery); freeDatabaseQuery(dbQuery);
disconnectFromDatabase(dbConnection); dbQuery = null;
return true; return true;
} }
@@ -647,20 +655,20 @@ function setClanOwner(clanId, ownerId) {
// =========================================================================== // ===========================================================================
function setClanMemberTag(memberId, tag) { function setClanMemberTag(clanId, memberId, tag) {
// finish this later, need to query db getClanData(clanId).members[memberId].customTag = tag;
} }
// =========================================================================== // ===========================================================================
function setClanMemberFlags(memberId, flags) { function setClanMemberFlags(clan, memberId, flags) {
// finish this later, need to query db getClanData(clanId).members[memberId].flags = flags;
} }
// =========================================================================== // ===========================================================================
function setClanMemberTitle(memberId, title) { function setClanMemberTitle(clan, memberId, title) {
// finish this later, need to query db getClanData(clanId).members[memberId].customTitle = customTitle;
} }
// =========================================================================== // ===========================================================================
@@ -717,4 +725,8 @@ function arePlayersInSameClan(client1, client2) {
return false; return false;
} }
// =========================================================================== // ===========================================================================
function getPlayerClanRank(client) {
return
}