Skip to content

Replace 'accounts' with 'account_detals' (save bug) #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Abu-Maher wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace 'accounts' with 'account_detals' (save bug) #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions mods/deathmatch/resources/admin-system/Player/adminjail_s.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ function jailPlayer(thePlayer, commandName, who, minutes, ...)
detachElements(targetPlayer)

if (minutes>=999) then
mysql:query_free("UPDATE accounts SET adminjail='1', adminjail_time='" .. mysql:escape_string(minutes) .. "', adminjail_permanent='1', adminjail_by='" .. mysql:escape_string(playerName) .. "', adminjail_reason='" .. mysql:escape_string(reason) .. "' WHERE id='" .. mysql:escape_string(accountID) .. "'")
mysql:query_free("UPDATE account_details SET adminjail='1', adminjail_time='" .. mysql:escape_string(minutes) .. "', adminjail_permanent='1', adminjail_by='" .. mysql:escape_string(playerName) .. "', adminjail_reason='" .. mysql:escape_string(reason) .. "' WHERE account_id='" .. mysql:escape_string(accountID) .. "'")
minutes = "indefinitely."
exports.anticheat:changeProtectedElementDataEx(targetPlayer, "jailtimer", true, false)
else
mysql:query_free("UPDATE accounts SET adminjail='1', adminjail_time='" .. mysql:escape_string(minutes) .. "', adminjail_permanent='0', adminjail_by='" .. mysql:escape_string(playerName) .. "', adminjail_reason='" .. mysql:escape_string(reason) .. "' WHERE id='" .. mysql:escape_string(tonumber(accountID)) .. "'")
mysql:query_free("UPDATE account_details SET adminjail='1', adminjail_time='" .. mysql:escape_string(minutes) .. "', adminjail_permanent='0', adminjail_by='" .. mysql:escape_string(playerName) .. "', adminjail_reason='" .. mysql:escape_string(reason) .. "' WHERE account_id='" .. mysql:escape_string(tonumber(accountID))
local theTimer = setTimer(timerUnjailPlayer, 60000, 1, targetPlayer)
setElementData(targetPlayer, "jailtimer", theTimer, false)
exports.anticheat:changeProtectedElementDataEx(targetPlayer, "jailserved", 0, false)
Expand Down Expand Up @@ -90,8 +90,8 @@ function jailPlayer(thePlayer, commandName, who, minutes, ...)
end
end
end
--addCommandHandler("jail", jailPlayer, false, false)
--addCommandHandler("sjail", jailPlayer, false, false)
addCommandHandler("jail", jailPlayer, false, false)
addCommandHandler("sjail", jailPlayer, false, false)

--OFFLINE JAIL BY MAXIME--------------------
function offlineJailPlayer(thePlayer, commandName, who, minutes, ...)
Expand All @@ -114,9 +114,9 @@ function offlineJailPlayer(thePlayer, commandName, who, minutes, ...)
end
end
-- if player is acutally offline.
local row = mysql:query_fetch_assoc("SELECT `id`, `username`, `mtaserial`, `admin` FROM `accounts` WHERE `username`='".. mysql:escape_string( who ) .."' LIMIT 1")
local row = mysql:query_fetch_assoc("SELECT `id`, `username`, `admin` FROM `accounts` WHERE `username`='".. mysql:escape_string( who ) .."' LIMIT 1")
local accountID = false
local accountUsername = false
local accountUsername = true -- let it be true, because when you jail an offline player, in order not to getElementData errors in the debug.
if row and row.id ~= mysql_null() then
accountID = row["id"]
accountUsername = row["username"]
Expand All @@ -128,11 +128,11 @@ function offlineJailPlayer(thePlayer, commandName, who, minutes, ...)
local playerName = getPlayerName(thePlayer)

if (minutes>=999) then
mysql:query_free("UPDATE accounts SET adminjail='1', adminjail_time='" .. mysql:escape_string(minutes) .. "', adminjail_permanent='1', adminjail_by='" .. mysql:escape_string(playerName) .. "', adminjail_reason='" .. mysql:escape_string(reason) .. "' WHERE id='" .. mysql:escape_string(accountID) .. "'")
mysql:query_free("UPDATE account_details SET adminjail='1', adminjail_time='" .. mysql:escape_string(minutes) .. "', adminjail_permanent='1', adminjail_by='" .. mysql:escape_string(playerName) .. "', adminjail_reason='" .. mysql:escape_string(reason) .. "' WHERE account_id='" .. mysql:escape_string(accountID) .. "'")
minutes = 9999999
minutesString = "indefinitely."
else
mysql:query_free("UPDATE accounts SET adminjail='1', adminjail_time='" .. mysql:escape_string(minutes) .. "', adminjail_permanent='0', adminjail_by='" .. mysql:escape_string(playerName) .. "', adminjail_reason='" .. mysql:escape_string(reason) .. "' WHERE id='" .. mysql:escape_string(tonumber(accountID)) .. "'")
mysql:query_free("UPDATE account_details SET adminjail='1', adminjail_time='" .. mysql:escape_string(minutes) .. "', adminjail_permanent='0', adminjail_by='" .. mysql:escape_string(playerName) .. "', adminjail_reason='" .. mysql:escape_string(reason) .. "' WHERE account_id='" .. mysql:escape_string(tonumber(accountID)) .. "'")
minutesString = minutes .. " minutes(s)."
end

Expand All @@ -156,8 +156,8 @@ function offlineJailPlayer(thePlayer, commandName, who, minutes, ...)
end
end
end
--addCommandHandler("ojail", offlineJailPlayer, false, false)
--addCommandHandler("sojail", offlineJailPlayer, false, false)
addCommandHandler("ojail", offlineJailPlayer, false, false)
addCommandHandler("sojail", offlineJailPlayer, false, false)

function timerUnjailPlayer(jailedPlayer)
if(isElement(jailedPlayer)) then
Expand All @@ -170,7 +170,7 @@ function timerUnjailPlayer(jailedPlayer)
exports.anticheat:changeProtectedElementDataEx(jailedPlayer, "jailtime", timeLeft, false)

if (timeLeft<=0) and not (getElementData(jailedPlayer, "pd.jailtime")) then
local query = mysql:query_free("UPDATE accounts SET adminjail_time='0', adminjail='0' WHERE id='" .. mysql:escape_string(accountID) .. "'")
local query = mysql:query_free("UPDATE account_details SET adminjail_time='0', adminjail='0' WHERE account_id='" .. mysql:escape_string(accountID) .. "'")
exports.anticheat:changeProtectedElementDataEx(jailedPlayer, "jailtimer", false, false)
exports.anticheat:changeProtectedElementDataEx(jailedPlayer, "adminjailed", false, false)
exports.anticheat:changeProtectedElementDataEx(jailedPlayer, "jailreason", false, false)
Expand Down Expand Up @@ -199,7 +199,7 @@ function timerUnjailPlayer(jailedPlayer)
exports.global:sendMessageToAdmins("[JAIL]: " .. getPlayerName(jailedPlayer):gsub("_", " ") .. " has served " .. genderm .. " jail time.")
--triggerClientEvent(jailedPlayer, "updateAdminJailCounter", jailedPlayer, nil)
else
local query = mysql:query_free("UPDATE accounts SET adminjail_time='" .. mysql:escape_string(timeLeft) .. "' WHERE id='" .. mysql:escape_string(accountID) .. "'")
local query = mysql:query_free("UPDATE account_details SET adminjail_time='" .. mysql:escape_string(timeLeft) .. "' WHERE account_id='" .. mysql:escape_string(accountID) .. "'")
local theTimer = setTimer(timerUnjailPlayer, 60000, 1, jailedPlayer)
setElementData(jailedPlayer, "jailtimer", theTimer, false)
local jailCounter = {}
Expand Down Expand Up @@ -229,7 +229,7 @@ function unjailPlayer(thePlayer, commandName, who)
if not (jailed) then
outputChatBox(targetPlayerName .. " is not jailed.", thePlayer, 255, 0, 0)
else
local query = mysql:query_free("UPDATE account_details SET adminjail_time='0', adminjail='0' WHERE id='" .. mysql:escape_string(accountID) .. "'")
local query = mysql:query_free("UPDATE account_details SET adminjail_time='0', adminjail='0' WHERE account_id='" .. mysql:escape_string(accountID) .. "'")

if isTimer(jailed) then
killTimer(jailed)
Expand Down