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

Woops wrong db field name for acct register

Browse Source
This commit is contained in:
Vortrex
2022-07-27 00:41:56 -05:00
parent 468cd46750
commit 4ede78bd7c
2 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/server/account.js
View File

@@ -78,7 +78,7 @@ class AccountData {
this.databaseId = dbAssoc["acct_id"]; this.databaseId = dbAssoc["acct_id"];
this.name = dbAssoc["acct_name"]; this.name = dbAssoc["acct_name"];
this.password = dbAssoc["acct_pass"]; this.password = dbAssoc["acct_pass"];
this.registerDate = dbAssoc["acct_when_made"]; this.registerDate = dbAssoc["acct_when_registered"];
this.flags = { this.flags = {
moderation: dbAssoc["acct_svr_mod_flags"], moderation: dbAssoc["acct_svr_mod_flags"],
admin: dbAssoc["acct_svr_staff_flags"], admin: dbAssoc["acct_svr_staff_flags"],
@@ -1495,7 +1495,7 @@ function initClient(client) {
// let iso = module.geoip.getCountryISO(getPlayerIP(client)); // let iso = module.geoip.getCountryISO(getPlayerIP(client));
// let localeId = getLocaleFromCountryISO(iso); // let localeId = getLocaleFromCountryISO(iso);
//} //}
//showGameMessage(client, getLocaleString(client, "LocaleOffer", `/lang ${getLocaleData(localeId)[2]}`), getColourByName("white"), 10000, "Roboto"); //showSmallGameMessage(client, getLocaleString(client, "LocaleOffer", `/lang ${getLocaleData(localeId)[2]}`), getColourByName("white"), 10000, "Roboto");
} }
startLoginTimeoutForPlayer(client); startLoginTimeoutForPlayer(client);
playRadioStreamForPlayer(client, getServerIntroMusicURL(), true, getPlayerStreamingRadioVolume(client)); playRadioStreamForPlayer(client, getServerIntroMusicURL(), true, getPlayerStreamingRadioVolume(client));
@@ -1868,10 +1868,10 @@ function sendAccountTwoFactorAuthCode(emailAddress, name, twoFactorAuthCode) {
function startLoginTimeoutForPlayer(client) { function startLoginTimeoutForPlayer(client) {
getPlayerData(client).loginTimeout = setTimeout(function () { getPlayerData(client).loginTimeout = setTimeout(function () {
//if (isPlayerLoggedIn(client) == false) { if (isPlayerLoggedIn(client) == false) {
getPlayerData(client).customDisconnectReason = "Kicked - Login timeout"; getPlayerData(client).customDisconnectReason = "Kicked - Login timeout";
disconnectPlayer(client); disconnectPlayer(client);
//} }
}, getGlobalConfig().loginTimeout); }, getGlobalConfig().loginTimeout);
} }

37
scripts/server/bitflag.js
View File

@@ -104,6 +104,24 @@ let serverBitFlagKeys = {
"ManageRanks", "ManageRanks",
"Owner", "Owner",
], ],
clanDiscordWebhookFlagKeys: [
"None",
"ClanName",
"ClanMOTD",
"ClanTag",
"ClanRankEdit",
"ClanRankSet",
"ClanVehicleEdit",
"ClanHouseEdit",
"ClanBusinessEdit",
"ClanNPCEdit",
"ClanMemberInvite",
"ClanMemberRemove",
"ClanMemberSuspend",
"ClanRankFlagSet",
"ClanTurfWar",
"ClanPointWar",
],
accountSettingsFlagKeys: [ accountSettingsFlagKeys: [
"None", "None",
"UseWhiteList", "UseWhiteList",
@@ -247,13 +265,14 @@ let serverBitFlagKeys = {
// =========================================================================== // ===========================================================================
function initBitFlagScript() { function initBitFlagScript() {
logToConsole(LOG_INFO, "[VRR.BitFlag]: Initializing bit flag script ..."); logToConsole(LOG_DEBUG, "[VRR.BitFlag]: Initializing bit flag script ...");
serverBitFlags.staffFlags = createBitFlagTable(serverBitFlagKeys.staffFlagKeys); serverBitFlags.staffFlags = createBitFlagTable(serverBitFlagKeys.staffFlagKeys);
serverBitFlags.moderationFlags = createBitFlagTable(serverBitFlagKeys.moderationFlagKeys); serverBitFlags.moderationFlags = createBitFlagTable(serverBitFlagKeys.moderationFlagKeys);
serverBitFlags.accountSettingsFlags = createBitFlagTable(serverBitFlagKeys.accountSettingsFlagKeys); serverBitFlags.accountSettingsFlags = createBitFlagTable(serverBitFlagKeys.accountSettingsFlagKeys);
//serverBitFlags.subAccountSettingsFlags = createBitFlagTable(getServerData().subAccountSettingsFlagKeys); //serverBitFlags.subAccountSettingsFlags = createBitFlagTable(getServerData().subAccountSettingsFlagKeys);
serverBitFlags.clanFlags = createBitFlagTable(serverBitFlagKeys.clanFlagKeys); serverBitFlags.clanFlags = createBitFlagTable(serverBitFlagKeys.clanFlagKeys);
serverBitFlags.clanTypeFlagKeys = createBitFlagTable(serverBitFlagKeys.clanTypeFlagKeys); serverBitFlags.clanTypeFlags = createBitFlagTable(serverBitFlagKeys.clanTypeFlagKeys);
serverBitFlags.clanDiscordWebhookFlags = createBitFlagTable(serverBitFlagKeys.clanDiscordWebhookFlagKeys);
//serverBitFlags.factionFlags = createBitFlagTable(serverBitFlagKeys.factionFlagKeys); //serverBitFlags.factionFlags = createBitFlagTable(serverBitFlagKeys.factionFlagKeys);
serverBitFlags.npcTriggerTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerTypeKeys); serverBitFlags.npcTriggerTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerTypeKeys);
serverBitFlags.npcTriggerConditionTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerConditionTypeKeys); serverBitFlags.npcTriggerConditionTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerConditionTypeKeys);
@@ -410,6 +429,20 @@ function getModerationFlagValue(flagName) {
// =========================================================================== // ===========================================================================
function getClanDiscordWebhookValue(flagName) {
if (flagName == "All") {
return -1;
}
if (typeof serverBitFlags.clanDiscordWebhookFlags[flagName] == "undefined") {
return false;
}
return serverBitFlags.clanDiscordWebhookFlags[flagName];
}
// ===========================================================================
function givePlayerStaffFlag(client, flagName) { function givePlayerStaffFlag(client, flagName) {
if (!getStaffFlagValue(flagName)) { if (!getStaffFlagValue(flagName)) {
return false; return false;