diff --git a/[admin]/acpanel/meta.xml b/[admin]/acpanel/meta.xml
index 87eae0da7..bbc86b108 100644
--- a/[admin]/acpanel/meta.xml
+++ b/[admin]/acpanel/meta.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -20,7 +20,7 @@
- _version then
- outputChatBox("New version of Anti-Cheat panel is available!")
+ outputServerLog("New version of Anti-Cheat panel is available!")
end
end
end
diff --git a/[admin]/admin/admin_definitions.lua b/[admin]/admin/admin_definitions.lua
index dbb610221..c8bf77628 100644
--- a/[admin]/admin/admin_definitions.lua
+++ b/[admin]/admin/admin_definitions.lua
@@ -10,156 +10,14 @@
_DEBUG = false
-_version = '1.5.9'
+_version = '1.6'
+
+-- MISC DEFINITIONS
+ADMIN_CHAT_MAXLENGTH = 225
function enum ( args, prefix )
for i, v in ipairs ( args ) do
if ( prefix ) then _G[v] = prefix..i
else _G[v] = i end
end
-end
-
--- MISC DEFINITIONS
-ADMIN_CHAT_MAXLENGTH = 225
-
--- EVENT CALLS
-
-enum
-({
- "EVENT_SYNC",
- "EVENT_SYNC_PERMISSIONS",
- "EVENT_TEAM",
- "EVENT_ADMIN",
- "EVENT_PLAYER",
- "EVENT_VEHICLE",
- "EVENT_RESOURCE",
- "EVENT_SERVER",
- "EVENT_MESSAGE",
- "EVENT_BANS",
- "EVENT_EXECUTE",
- "EVENT_ADMIN_CHAT",
- "EVENT_ADMIN_OPEN",
-
- "EVENT_RESOURCE_START",
- "EVENT_RESOURCE_STOP",
- "EVENT_PLAYER_JOIN"
-} )
-
--- SYNC DEFINITIONS
-
-enum
-({
- "SYNC_PLAYER",
- "SYNC_PLAYERS",
- "SYNC_RESOURCES",
- "SYNC_ADMINS",
- "SYNC_SERVER",
- "SYNC_RIGHTS",
- "SYNC_BANS",
- "SYNC_MESSAGES"
-})
-
--- TEAM DEFINITIONS
-
-enum
-({
- "TEAM_CREATE",
- "TEAM_DESTROY"
-})
-
--- ADMIN DEFINITIONS
-
-enum
-({
- "ADMIN_PASSWORD",
- "ADMIN_AUTOLOGIN",
- "ADMIN_SYNC",
- "ADMIN_ACL_CREATE",
- "ADMIN_ACL_DESTROY",
- "ADMIN_ACL_ADD",
- "ADMIN_ACL_REMOVE"
-})
-
--- PLAYER DEFINITIONS
-
-enum
-({
- "PLAYER_KICK",
- "PLAYER_BAN",
- "PLAYER_MUTE",
- "PLAYER_FREEZE",
- "PLAYER_SHOUT",
- "PLAYER_SET_HEALTH",
- "PLAYER_SET_ARMOUR",
- "PLAYER_SET_SKIN",
- "PLAYER_SET_MONEY",
- "PLAYER_SET_STAT",
- "PLAYER_SET_TEAM",
- "PLAYER_SET_INTERIOR",
- "PLAYER_SET_DIMENSION",
- "PLAYER_JETPACK",
- "PLAYER_SET_GROUP",
- "PLAYER_GIVE_VEHICLE",
- "PLAYER_GIVE_WEAPON",
- "PLAYER_SLAP",
- "PLAYER_WARP",
- "PLAYER_WARP_TO"
-})
-
--- VEHICLE DEFINITIONS
-
-enum
-({
- "VEHICLE_REPAIR",
- "VEHICLE_CUSTOMIZE",
- "VEHICLE_SET_PAINTJOB",
- "VEHICLE_SET_COLOR",
- "VEHICLE_BLOW",
- "VEHICLE_DESTROY"
-})
-
--- RESOURCE DEFINITIONS
-
-enum
-({
- "RESOURCE_START",
- "RESOURCE_RESTART",
- "RESOURCE_STOP"
-})
-
--- SERVER DEFINITIONS
-
-enum
-({
- "SERVER_SET_GAME",
- "SERVER_SET_MAP",
- "SERVER_SET_WELCOME",
- "SERVER_SET_TIME",
- "SERVER_SET_PASSWORD",
- "SERVER_SET_WEATHER",
- "SERVER_BLEND_WEATHER",
- "SERVER_SET_GAME_SPEED",
- "SERVER_SET_GRAVITY",
- "SERVER_SET_BLUR_LEVEL",
- "SERVER_SET_WAVE_HEIGHT"
-})
-
--- MESSAGE DEFINITIONS
-
-enum
-({
- "MESSAGE_NEW",
- "MESSAGE_GET",
- "MESSAGE_READ",
- "MESSAGE_DELETE"
-})
-
--- BANS DEFINITIONS
-
-enum
-({
- "BANS_BAN_IP",
- "BANS_BAN_SERIAL",
- "BANS_UNBAN_IP",
- "BANS_UNBAN_SERIAL"
-})
+end
\ No newline at end of file
diff --git a/[admin]/admin/client/admin_client.lua b/[admin]/admin/client/admin_client.lua
index f5fe95020..774aa9a9d 100644
--- a/[admin]/admin/client/admin_client.lua
+++ b/[admin]/admin/client/admin_client.lua
@@ -10,7 +10,7 @@
_DEBUG = false
-_version = '1.5.9'
+_version = '1.6'
_flags = {}
_widgets = {}
_settings = nil
@@ -26,6 +26,7 @@ function aClientAdminMenu ()
aAdminMenuClose ( false )
else
aAdminMenu ()
+ guiFocus (aAdminForm)
end
end
@@ -39,6 +40,7 @@ addEvent ( "aClientAdminChat", true )
addEvent ( "aClientResourceStart", true )
addEvent ( "aClientResourceStop", true )
addEvent ( "aClientAdminMenu", true )
+addEvent ( "aClientReports", true )
function aAdminResourceStart ()
addEventHandler ( "aClientAdminMenu", root, aClientAdminMenu )
local node = xmlLoadFile ( "conf\\weathers.xml" )
diff --git a/[admin]/admin/client/colorpicker/colorpicker.lua b/[admin]/admin/client/colorpicker/colorpicker.lua
index 713cc0ff8..e27aa3a08 100644
--- a/[admin]/admin/client/colorpicker/colorpicker.lua
+++ b/[admin]/admin/client/colorpicker/colorpicker.lua
@@ -82,7 +82,6 @@ function colorPicker.create(id, start, title)
end
function colorPicker:render()
- -- if not self.gui.focus then return end
local x,y = guiGetPosition(self.gui.window, false)
dxDrawRectangle(x+16, y+32, 256, 256, self.color.huecurrent, self.gui.focus)
dxDrawImage(x+16, y+32, 256, 256, "client/colorpicker/sv.png", 0, 0, 0, self.color.white, self.gui.focus)
diff --git a/[admin]/admin/client/gui/admin_acl.lua b/[admin]/admin/client/gui/admin_acl.lua
index 29f57abf1..70b777e35 100644
--- a/[admin]/admin/client/gui/admin_acl.lua
+++ b/[admin]/admin/client/gui/admin_acl.lua
@@ -24,14 +24,14 @@ function aManageACL ()
guiGridListSetSortingEnabled ( aACLList, false )
guiGridListAddColumn( aACLList, "", 0.10 )
guiGridListAddColumn( aACLList, "", 0.85 )
- aACLCreateGroup = guiCreateButton ( 0.55, 0.05, 0.40, 0.04, "Create group", true, aAclForm )
- aACLCreateACL = guiCreateButton ( 0.55, 0.10, 0.40, 0.04, "Create ACL", true, aAclForm )
+ aACLCreateGroup = guiCreateButton ( 0.55, 0.05, 0.40, 0.04, "Create group", true, aAclForm, "aclcreate" )
+ aACLCreateACL = guiCreateButton ( 0.55, 0.10, 0.40, 0.04, "Create ACL", true, aAclForm, "aclcreate" )
aACLLabel = guiCreateLabel ( 0.55, 0.19, 0.40, 0.04, "", true, aAclForm )
aACLSeparator = guiCreateStaticImage ( 0.55, 0.235, 0.40, 0.0025, "client\\images\\dot.png", true, aAclForm )
- aACLDestroyGroup = guiCreateButton ( 0.55, 0.25, 0.40, 0.04, "Destroy group", true, aAclForm )
- aACLDestroyACL = guiCreateButton ( 0.55, 0.25, 0.40, 0.04, "Destroy ACL", true, aAclForm )
- aACLAddObject = guiCreateButton ( 0.55, 0.30, 0.40, 0.04, "Add Object", true, aAclForm )
- aACLRemoveObject = guiCreateButton ( 0.55, 0.35, 0.40, 0.04, "Remove Object", true, aAclForm )
+ aACLDestroyGroup = guiCreateButton ( 0.55, 0.25, 0.40, 0.04, "Destroy group", true, aAclForm, "acldestroy" )
+ aACLDestroyACL = guiCreateButton ( 0.55, 0.25, 0.40, 0.04, "Destroy ACL", true, aAclForm, "acldestroy" )
+ aACLAddObject = guiCreateButton ( 0.55, 0.30, 0.40, 0.04, "Add Object", true, aAclForm, "acladd" )
+ aACLRemoveObject = guiCreateButton ( 0.55, 0.35, 0.40, 0.04, "Remove Object", true, aAclForm, "aclremove" )
aACLAddACL = guiCreateButton ( 0.55, 0.40, 0.40, 0.04, "Add ACL", true, aAclForm )
aACLRemoveACL = guiCreateButton ( 0.55, 0.45, 0.40, 0.04, "Remove ACL", true, aAclForm )
diff --git a/[admin]/admin/client/gui/admin_main.lua b/[admin]/admin/client/gui/admin_main.lua
index bcbf74c88..965b9a3c0 100644
--- a/[admin]/admin/client/gui/admin_main.lua
+++ b/[admin]/admin/client/gui/admin_main.lua
@@ -20,6 +20,7 @@ aLastSync = 0
aResources = {}
local serverPassword = 'None'
+local hasResourceSetting
function guiComboBoxAdjustHeight ( combobox, itemcount )
if getElementType ( combobox ) ~= "gui-combobox" or type ( itemcount ) ~= "number" then error ( "Invalid arguments @ 'guiComboBoxAdjustHeight'", 2 ) end
@@ -181,7 +182,7 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal
aTab2 = {}
aTab2.Tab = guiCreateTab ( "Resources", aTabPanel, "resources" )
- aTab2.ManageACL = guiCreateButton ( 0.75, 0.02, 0.23, 0.04, "Manage ACL", true, aTab2.Tab )
+ aTab2.ManageACL = guiCreateButton ( 0.75, 0.02, 0.23, 0.04, "Manage ACL", true, aTab2.Tab, "aclmanager" )
aTab2.ResourceListSearch = guiCreateEdit ( 0.03, 0.05, 0.31, 0.04, "", true, aTab2.Tab )
guiCreateStaticImage ( 0.34, 0.05, 0.035, 0.04, "client\\images\\search.png", true, aTab2.Tab )
aTab2.ResourceList = guiCreateGridList ( 0.03, 0.10, 0.35, 0.80, true, aTab2.Tab )
@@ -194,6 +195,7 @@ y=y+B aTab1.VehicleHealth = guiCreateLabel ( 0.26, y, 0.25, 0.04, "Vehicle Heal
aTab2.ResourceInclMaps = guiCreateCheckBox ( 0.03, 0.91, 0.15, 0.04, "Include Maps", false, true, aTab2.Tab )
aTab2.ResourceRefresh = guiCreateButton ( 0.20, 0.915, 0.18, 0.04, "Refresh list", true, aTab2.Tab, "listresources" )
aTab2.ResourceSettings = guiCreateButton ( 0.40, 0.05, 0.20, 0.04, "Settings", true, aTab2.Tab )
+ guiSetVisible ( aTab2.ResourceSettings, false)
aTab2.ResourceStart = guiCreateButton ( 0.40, 0.10, 0.20, 0.04, "Start", true, aTab2.Tab, "start" )
aTab2.ResourceRestart = guiCreateButton ( 0.40, 0.15, 0.20, 0.04, "Restart", true, aTab2.Tab, "restart" )
aTab2.ResourceStop = guiCreateButton ( 0.40, 0.20, 0.20, 0.04, "Stop", true, aTab2.Tab, "stop" )
@@ -969,7 +971,9 @@ end
function aClientDoubleClick ( button )
if ( source == aTab2.ResourceList ) then
if ( guiGridListGetSelectedItem ( aTab2.ResourceList ) ~= -1 ) then
- aManageSettings ( guiGridListGetItemText ( aTab2.ResourceList, guiGridListGetSelectedItem( aTab2.ResourceList ), 1 ) )
+ if hasResourceSetting then
+ aManageSettings ( guiGridListGetItemText ( aTab2.ResourceList, guiGridListGetSelectedItem( aTab2.ResourceList ), 1 ) )
+ end
end
elseif ( source == aTab4.BansList ) then
if ( guiGridListGetSelectedItem ( aTab4.BansList ) == -1 ) then
@@ -1059,6 +1063,10 @@ function aClientClick ( button )
elseif ( source == aTab2.ResourceList ) then
guiSetVisible ( aTab2.ResourceFailture, false )
if ( guiGridListGetSelectedItem ( aTab2.ResourceList ) ~= -1 ) then
+ local resName = guiGridListGetItemText(aTab2.ResourceList, guiGridListGetSelectedItem( aTab2.ResourceList ), 1)
+ if resName then
+ triggerServerEvent("aAdmin", localPlayer, "resourcelist", resName)
+ end
guiSetText(aTab2.ResourceName, "Full Name: " .. guiGridListGetItemText(aTab2.ResourceList, guiGridListGetSelectedItem ( aTab2.ResourceList ), 4))
guiSetText(aTab2.ResourceAuthor, "Author: " .. guiGridListGetItemText(aTab2.ResourceList, guiGridListGetSelectedItem ( aTab2.ResourceList ), 5))
guiSetText(aTab2.ResourceVersion, "Version: " .. guiGridListGetItemText(aTab2.ResourceList, guiGridListGetSelectedItem ( aTab2.ResourceList ), 6))
@@ -1192,6 +1200,17 @@ function aClientClick ( button )
end
end
+addEvent ("setVisibilityOfSettingsButton", true)
+function setVisibilityOfSettingsButton (showResourceSetting)
+ hasResourceSetting = showResourceSetting
+ if hasResourceSetting then
+ guiSetVisible(aTab2.ResourceSettings, true)
+ else
+ guiSetVisible(aTab2.ResourceSettings, false)
+ end
+end
+addEventHandler ( "setVisibilityOfSettingsButton", resourceRoot, setVisibilityOfSettingsButton)
+
function aClientRender ()
if ( guiGetVisible ( aAdminForm ) ) then
if ( getTickCount() >= aLastCheck ) then
diff --git a/[admin]/admin/client/gui/admin_maps.lua b/[admin]/admin/client/gui/admin_maps.lua
index 43cfd6b64..2b037f4c8 100644
--- a/[admin]/admin/client/gui/admin_maps.lua
+++ b/[admin]/admin/client/gui/admin_maps.lua
@@ -78,15 +78,6 @@ function guiClick(button)
else
guiSetEnabled(aTabMap.NextMap, false)
end
- -- if gamemode == "deleted maps" then
- -- guiSetEnabled(aTabMap.Start, false)
- -- guiSetEnabled(aTabMap.Delete, false)
- -- guiSetEnabled(aTabMap.Revert, true)
- -- else
- -- guiSetEnabled(aTabMap.Start, true)
- -- guiSetEnabled(aTabMap.Delete, true)
- -- guiSetEnabled(aTabMap.Revert, false)
- -- end
elseif source == aTabMap.Start then
triggerServerEvent("startGamemodeMap_s", localPlayer, gamemode, mapResName)
elseif source == aTabMap.NextMap then
diff --git a/[admin]/admin/client/gui/admin_messages.lua b/[admin]/admin/client/gui/admin_messages.lua
index f72d25cf9..7d88bdde5 100644
--- a/[admin]/admin/client/gui/admin_messages.lua
+++ b/[admin]/admin/client/gui/admin_messages.lua
@@ -55,10 +55,11 @@ function aViewMessagesClose ( destroy )
end
end
-function aMessagesSync ( action, data )
+function aMessagesSync ( action, data, isReportDisabled )
if ( action == "get" ) then
_messages = data
guiGridListClear ( aMessagesList )
+
for id=#data,1,-1 do
local message = data[id]
local row = guiGridListAddRow ( aMessagesList )
@@ -68,6 +69,7 @@ function aMessagesSync ( action, data )
guiGridListSetItemText ( aMessagesList, row, 3, message.time, false, false )
guiGridListSetItemText ( aMessagesList, row, 4, removeColorCoding(message.author), false, false )
end
+ guiSetText(aMessagesForm, (isReportDisabled ~= "true" and "View Messages (reports are disabled)" or "View Messages"))
end
end
diff --git a/[admin]/admin/client/gui/admin_performance.lua b/[admin]/admin/client/gui/admin_performance.lua
index 75ecd8207..ab39899c7 100644
--- a/[admin]/admin/client/gui/admin_performance.lua
+++ b/[admin]/admin/client/gui/admin_performance.lua
@@ -25,7 +25,7 @@ function aPerformance ()
aPerformanceVehicle = guiCreateCheckBox ( 0.05, 0.50, 0.90, 0.08, "Unload Vehicle Form when not used", false, true, aPerformanceForm )
aPerformanceBan = guiCreateCheckBox ( 0.05, 0.58, 0.90, 0.08, "Unload Ban Form when not used", false, true, aPerformanceForm )
guiCreateStaticImage ( 0.05, 0.68, 0.60, 0.003, "client\\images\\dot.png", true, aPerformanceForm )
- aPerformanceInput = guiCreateCheckBox ( 0.05, 0.70, 0.90, 0.08, "Unload Input Box when not used", false, true, aPerformanceForm )
+ aPerformanceInput = guiCreateCheckBox ( 0.05, 0.70, 0.90, 0.08, "Unload Input Box when not used", false, true, aPerformanceForm )
aPerformanceMessage = guiCreateCheckBox ( 0.05, 0.78, 0.90, 0.08, "Unload Message Box when not used", false, true, aPerformanceForm )
aPerformanceOk = guiCreateButton ( 0.79, 0.90, 0.18, 0.08, "Ok", true, aPerformanceForm )
diff --git a/[admin]/admin/client/gui/admin_report.lua b/[admin]/admin/client/gui/admin_report.lua
index 588f7c3cd..080abfd68 100644
--- a/[admin]/admin/client/gui/admin_report.lua
+++ b/[admin]/admin/client/gui/admin_report.lua
@@ -13,6 +13,7 @@ local reportCategories
local aSelectPlayer = nil
function aReport ( )
+
if ( aReportForm == nil ) then
reportCategories = {}
for i,cat in ipairs( split( g_Prefs.reportCategories, string.byte(',') ) ) do
@@ -58,8 +59,7 @@ function aReport ( )
guiBringToFront ( aReportForm )
showCursor ( true )
end
-addCommandHandler ( "report", aReport )
-
+addEventHandler( "aClientReports", root, aReport )
function aReportClose ( )
if ( aReportForm ) then
diff --git a/[admin]/admin/client/gui/admin_vehicle.lua b/[admin]/admin/client/gui/admin_vehicle.lua
index a50296055..bc4ef3c7c 100644
--- a/[admin]/admin/client/gui/admin_vehicle.lua
+++ b/[admin]/admin/client/gui/admin_vehicle.lua
@@ -241,9 +241,6 @@ function aClientVehicleClick ( button )
triggerServerEvent ( "aVehicle", localPlayer, aVehicleCustomizePlayer, "setlights", { guiGetText ( aLightsColor ) } )
elseif ( source == aLicensePlateSet ) then
triggerServerEvent ( "aVehicle", localPlayer, aVehicleCustomizePlayer, "setplates", { guiGetText ( aLicensePlate ) } )
- -- elseif ( source == aVehicleColorScheme ) then
- -- guiSetVisible ( aVehicleColorForm, true )
- -- guiBringToFront ( aVehicleColorForm )
elseif ( source == aVehicleUpgradeAll ) then
triggerServerEvent ( "aVehicle", localPlayer, aVehicleCustomizePlayer, "customize", { "all" } )
setTimer ( aVehicleCheckCurrentUpgrades, 2000, 1, aVehicleCustomizeVehicle )
diff --git a/[admin]/admin/conf/ACL.xml b/[admin]/admin/conf/ACL.xml
index fb105735c..ba89676c5 100644
--- a/[admin]/admin/conf/ACL.xml
+++ b/[admin]/admin/conf/ACL.xml
@@ -56,6 +56,12 @@
+
+
+
+
+
+
@@ -137,6 +143,12 @@
+
+
+
+
+
+
@@ -217,6 +229,12 @@
+
+
+
+
+
+
@@ -297,6 +315,12 @@
+
+
+
+
+
+
diff --git a/[admin]/admin/meta.xml b/[admin]/admin/meta.xml
index b4079f5a5..69de3ce01 100644
--- a/[admin]/admin/meta.xml
+++ b/[admin]/admin/meta.xml
@@ -1,5 +1,5 @@
-
+
+
@@ -17,6 +18,7 @@
+
@@ -114,52 +116,70 @@
4. double click on the resource name
***************************************************** -->
-
+
+
-
-
-
-
-
-
+
+
+
+
-
+
+
-
-
-
+
+
diff --git a/[admin]/admin/server/admin_report.lua b/[admin]/admin/server/admin_report.lua
new file mode 100644
index 000000000..a6f386c70
--- /dev/null
+++ b/[admin]/admin/server/admin_report.lua
@@ -0,0 +1,7 @@
+addCommandHandler("report", function( playerSource )
+ if ( get("reportsEnabled") ~= "false" ) then
+ triggerClientEvent( playerSource, "aClientReports", playerSource )
+ else
+ outputChatBox ( "Reports are not accepted currently.", playerSource, 255, 0, 0 )
+ end
+end, false, false)
\ No newline at end of file
diff --git a/[admin]/admin/server/admin_server.lua b/[admin]/admin/server/admin_server.lua
index 940357d1e..ff441fcf6 100644
--- a/[admin]/admin/server/admin_server.lua
+++ b/[admin]/admin/server/admin_server.lua
@@ -17,7 +17,6 @@ aInteriors = {}
aStats = {}
aReports = {}
aWeathers = {}
-aNickChangeTime = {}
local aUnmuteTimerList = {}
local chatHistory = {}
@@ -34,7 +33,7 @@ function notifyPlayerLoggedIn(player)
end
function aHandleIP2CUpdate()
- local playersToUpdate = false
+ local playersToUpdate = nil
local playersTable = getElementsByType("player") -- cache result, save function call
for playerID = 1, #playersTable do
@@ -136,7 +135,7 @@ addEventHandler ( "onResourceStart", root, function ( resource )
local stat = xmlFindChild ( node2, "stat", stats )
local id = tonumber ( xmlNodeGetAttribute ( stat, "id" ) )
local name = xmlNodeGetAttribute ( stat, "name" )
- aStats[id] = name
+ if (id) then aStats[id] = name end
stats = stats + 1
end
xmlUnloadFile ( node2 )
@@ -148,7 +147,7 @@ addEventHandler ( "onResourceStart", root, function ( resource )
local weather = xmlFindChild ( node3, "weather", weathers )
local id = tonumber ( xmlNodeGetAttribute ( weather, "id" ) )
local name = xmlNodeGetAttribute ( weather, "name" )
- aWeathers[id] = name
+ if (id) then aWeathers[id] = name end
weathers = weathers + 1
end
xmlUnloadFile ( node3 )
@@ -229,13 +228,9 @@ addEventHandler ( "onResourceStart", root, function ( resource )
while ( xmlFindChild ( subnode, "group", groups ) ) do
local group = xmlFindChild ( subnode, "group", groups )
local action = xmlNodeGetAttribute ( group, "action" )
- local r = tonumber ( xmlNodeGetAttribute ( group, "r" ) )
- local g = tonumber ( xmlNodeGetAttribute ( group, "g" ) )
- local b = tonumber ( xmlNodeGetAttribute ( group, "b" ) )
+ local r, g, b = tonumber ( xmlNodeGetAttribute ( group, "r" ) ), tonumber ( xmlNodeGetAttribute ( group, "g" ) ), tonumber ( xmlNodeGetAttribute ( group, "b" ) )
aLogMessages[type][action] = {}
- aLogMessages[type][action]["r"] = r or 0
- aLogMessages[type][action]["g"] = g or 255
- aLogMessages[type][action]["b"] = b or 0
+ aLogMessages[type][action]["r"], aLogMessages[type][action]["g"], aLogMessages[type][action]["b"] = r or 0, g or 255, b or 255
if ( xmlFindChild ( group, "all", 0 ) ) then aLogMessages[type][action]["all"] = xmlNodeGetValue ( xmlFindChild ( group, "all", 0 ) ) end
if ( xmlFindChild ( group, "admin", 0 ) ) then aLogMessages[type][action]["admin"] = xmlNodeGetValue ( xmlFindChild ( group, "admin", 0 ) ) end
if ( xmlFindChild ( group, "player", 0 ) ) then aLogMessages[type][action]["player"] = xmlNodeGetValue ( xmlFindChild ( group, "player", 0 ) ) end
@@ -347,11 +342,6 @@ function iif ( cond, arg1, arg2 )
return arg2
end
-local serialExp = "^" .. string.rep ( "[A-F0-9]", 32 ) .. "$"
-function isValidSerial ( serial )
- return serial:match ( serialExp )
-end
-
function getWeatherNameFromID ( weather )
return iif ( aWeathers[weather], aWeathers[weather], "Unknown" )
end
@@ -387,17 +377,17 @@ function aAddUnmuteTimer( player, length )
aRemoveUnmuteTimer( player )
local serial = getPlayerSerial( player )
aUnmuteTimerList[serial] = setTimer(
- function()
- aUnmuteTimerList[serial] = nil
- for _,plr in ipairs(getElementsByType('player')) do
- if getPlayerSerial(plr) == serial then
- if isPlayerMuted(plr) then
- triggerEvent ( "aPlayer", getElementByIndex("console", 0), plr, "mute" )
- end
- end
- end
- end,
- length*1000, 1 )
+ function()
+ aUnmuteTimerList[serial] = nil
+ for _,plr in ipairs(getElementsByType('player')) do
+ if getPlayerSerial(plr) == serial then
+ if isPlayerMuted(plr) then
+ triggerEvent ( "aPlayer", getElementByIndex("console", 0), plr, "mute" )
+ end
+ end
+ end
+ end,
+ length*1000, 1 )
end
function aRemoveUnmuteTimer( player )
@@ -454,18 +444,28 @@ function updatePlayerCountry ( player )
aPlayers[player]["country"] = isIP2CResourceRunning and exports.ip2c:getPlayerCountry ( player ) or false
end
-function aPlayerInitialize ( player )
- bindKey ( player, "p", "down", "admin" )
- --callRemote ( "http://community.mtasa.com/mta/verify.php", aPlayerSerialCheck, player, getPlayerSerial ( player ) )
- aPlayers[player] = {}
- aPlayers[player]["money"] = getPlayerMoney ( player )
- updatePlayerCountry ( player )
- chatHistory[player] = {}
+local serialExp = "^" .. string.rep("[A-F0-9]", 32) .. "$"
+function isValidSerial(serial)
+ return serial:match(serialExp)
+end
+
+function aPlayerInitialize(player)
+ local serial = getPlayerSerial(player)
+
+ if (not isValidSerial(serial)) then
+ outputChatBox("LOG: " .. getPlayerName(player) .. " - Possibly tampered serial. Denied entry.")
+ kickPlayer(player, "5B Client verification mismatch.")
+ end
+
+ bindKey(player, "p", "down", "admin")
+ aPlayers[player] = {}
+ aPlayers[player]["money"] = getPlayerMoney(player)
+ updatePlayerCountry(player)
+ chatHistory[player] = {}
end
addEventHandler ( "onPlayerQuit", root, function ()
aPlayers[source] = nil
- aNickChangeTime[source] = nil
chatHistory[source] = nil
end )
@@ -663,9 +663,22 @@ addEventHandler ( "aTeam", root, function ( action, name, r, g, b )
return false
end )
+local aAdminRights = {
+ ["settings"] = "general.tab_resources",
+ ["resourcelist"] = "general.tab_resources",
+
+ ["sync"] = "command.aclmanager",
+ ["aclcreate"] = "command.aclcreate",
+ ["acldestroy"] = "command.acldetroy",
+ ["acladd"] = "command.acladd",
+ ["aclremove"] = "command.aclremove",
+}
addEvent ( "aAdmin", true )
addEventHandler ( "aAdmin", root, function ( action, ... )
- if checkClient( true, source, 'aAdmin', action ) then
+ if not action then
+ return
+ end
+ if checkClient( aAdminRights[action] or true, source, 'aAdmin', action ) then
return
end
local mdata, mdata2
@@ -724,6 +737,17 @@ addEventHandler ( "aAdmin", root, function ( action, ... )
end
end
triggerClientEvent ( source, "aAdminSettings", root, cmd, resName, tableOut )
+ elseif (action == "resourcelist") then
+ local resName = arg[1]
+ local count = true
+ _, count = aGetResourceSettings(resName, count)
+ if count then
+ local hasResourceSetting
+ if count ~= 0 then
+ hasResourceSetting = true
+ end
+ triggerClientEvent ( source, "setVisibilityOfSettingsButton", resourceRoot, hasResourceSetting)
+ end
elseif ( action == "sync" ) then
local type = arg[1]
local tableOut = {}
@@ -1027,7 +1051,7 @@ addEventHandler ( "aPlayer", root, function ( player, action, data, additional,
if ( not setElementHealth ( player, health ) ) then
action = nil
end
- mdata = health
+ mdata = tostring( health )
else
action = nil
end
@@ -1038,14 +1062,14 @@ addEventHandler ( "aPlayer", root, function ( player, action, data, additional,
if ( not setPedArmor ( player, armour ) ) then
action = nil
end
- mdata = armour
+ mdata = tostring( armour )
else
action = nil
end
elseif ( action == "setskin" ) then
data = tonumber ( data )
if ( setElementModel( player, data) ) then
- mdata = data
+ mdata = tostring( data )
else
action = nil
outputChatBox( "Invalid skin ID", source, 255, 0, 0 )
@@ -1112,7 +1136,7 @@ addEventHandler ( "aPlayer", root, function ( player, action, data, additional,
if ( not setElementDimension ( player, dimension ) ) then
action = nil
end
- mdata = dimension
+ mdata = tostring( dimension )
else
action = nil
end
@@ -1185,7 +1209,7 @@ addEventHandler ( "aPlayer", root, function ( player, action, data, additional,
end
local x, y, z = getElementVelocity ( player )
setElementVelocity ( player, x , y, z + 0.2 )
- mdata = slap
+ mdata = tostring( slap )
else
action = nil
end
@@ -1453,6 +1477,7 @@ addEventHandler ( "aServer", root, function ( action, data, data2 )
end )
addEventHandler ( "onPlayerChat", root, function ( message )
+ if not isElement(source) then return end
local size = #chatHistory[source]
if ( size == g_Prefs.maxchatmsgs ) then
table.remove( chatHistory[source], 1 )
@@ -1485,6 +1510,8 @@ function ( action, data )
return
end
if ( action == "new" ) then
+ --dont allow creating reports when reports are disabled
+ if ( get("reportsEnabled") ~= "true" ) then return end
local time = getRealTime()
local id = #aReports + 1
aReports[id] = {}
@@ -1520,7 +1547,7 @@ function ( action, data )
end
if ( hasObjectPermissionTo ( client or source, "general.adminpanel" ) ) then
if ( action == "get" ) then
- triggerClientEvent ( source, "aMessage", source, "get", aReports )
+ triggerClientEvent ( source, "aMessage", source, "get", aReports, get("reportsEnabled") )
elseif ( action == "read" ) then
if ( aReports[data] ) then
aReports[data].read = true
@@ -1543,6 +1570,7 @@ end
addEvent ( "aModdetails", true )
addEventHandler ( "aModdetails", resourceRoot, function ( action, player )
+ if source ~= resourceRoot then return end
if checkClient( false, client, 'aModdetails', action ) then return end
if ( hasObjectPermissionTo ( client, "general.adminpanel" ) ) then
if ( action == "get" ) then
@@ -1631,6 +1659,7 @@ addCommandHandler(get("adminChatCommandName"),
addEventHandler('onElementDataChange', root,
function(dataName, oldValue )
+ if dataName == "superman:flying" or dataName == "hedit:saved" then return end
if getElementType(source)=='player' and checkClient( false, source, 'onElementDataChange', dataName ) then
setElementData( source, dataName, oldValue )
return
@@ -1640,14 +1669,18 @@ addEventHandler('onElementDataChange', root,
-- returns true if there is trouble
function checkClient(checkAccess,player,...)
- if client and client ~= player and g_Prefs.securitylevel >= 2 then
+ if client and client ~= player then
local desc = table.concat({...}," ")
local ipAddress = getPlayerIP(client)
+ local playerSerial = getPlayerSerial(client)
+ local banReason = "admin checkClient (" .. tostring(desc) .. ")"
outputDebugString( "Admin security - Client/player mismatch from " .. tostring(ipAddress) .. " (" .. tostring(desc) .. ")", 1 )
cancelEvent()
- if g_Prefs.clientcheckban then
- local reason = "admin checkClient (" .. tostring(desc) .. ")"
- addBan ( ipAddress, nil, nil, root, reason )
+ if g_Prefs.fakePacketsIPban then
+ addBan ( ipAddress, nil, nil, root, banReason, g_Prefs.fakePacketsIPbanLength )
+ end
+ if g_Prefs.fakePacketsSerialban then
+ addBan ( nil, nil, playerSerial, root, banReason, g_Prefs.fakePacketsSerialbanLength )
end
return true
end
@@ -1673,17 +1706,6 @@ function checkClient(checkAccess,player,...)
return false
end
-function checkNickOnChange(old, new)
- if aNickChangeTime[source] and aNickChangeTime[source] + tonumber(get("*nickChangeDelay")) > getTickCount() then
- cancelEvent()
- outputChatBox("You can only change your name once every "..(tonumber(get("*nickChangeDelay"))/1000).." seconds", source, 255, 0, 0)
- return false
- else
- aNickChangeTime[source] = getTickCount()
- end
-end
-addEventHandler("onPlayerChangeNick", root, checkNickOnChange)
-
addEventHandler ("onUnban",root,function(theBan,responsibleElement)
if isElement(responsibleElement) and getElementType (responsibleElement)=="player" then
outputServerLog ("BAN: "..getPlayerName(responsibleElement).."["..getAccountName (getPlayerAccount(responsibleElement)).."] ["..getPlayerSerial (responsibleElement).."] ["..getPlayerIP (responsibleElement).."] unbanned player "..(getBanNick(theBan) or "unknown").." ["..(getBanIP (theBan) or getBanSerial(theBan)).."] ")
diff --git a/[admin]/admin/server/admin_servermaps.lua b/[admin]/admin/server/admin_servermaps.lua
index 9c4b1c085..c95ed4be1 100644
--- a/[admin]/admin/server/admin_servermaps.lua
+++ b/[admin]/admin/server/admin_servermaps.lua
@@ -26,7 +26,6 @@ function getServerMaps (loadList)
end
if loadList then
- -- local deletedMaps = {}
local gamemodes
gamemodes = call(mapmanager, "getGamemodes")
for id,gamemode in ipairs (gamemodes) do
@@ -45,17 +44,9 @@ function getServerMaps (loadList)
local countGmodes = #tableOut
local maps = call(mapmanager, "getMapsCompatibleWithGamemode")
for id,map in ipairs (maps) do
- -- if fileOpen(":"..getResourceName(map).."/deleted") then
- -- table.insert(deletedMaps ,{name = getResourceInfo(map, "name") or getResourceName(map), resname = getResourceName(map)})
- -- else
- table.insert(tableOut[countGmodes]["maps"] ,{name = getResourceInfo(map, "name") or getResourceName(map), resname = getResourceName(map)})
- -- end
+ table.insert(tableOut[countGmodes]["maps"] ,{name = getResourceInfo(map, "name") or getResourceName(map), resname = getResourceName(map)})
end
- -- table.sort(deletedMaps, sortCompareFunction)
table.sort(tableOut[countGmodes]["maps"], sortCompareFunction)
- -- table.insert(tableOut, {name = "deleted maps", resname = "deleted maps", maps = {}})
- -- local countGmodes = countGmodes + 1
- -- tableOut[countGmodes]["maps"] = deletedMaps
end
local map = call(mapmanager, "getRunningGamemodeMap")
local gamemode = call(mapmanager, "getRunningGamemode")
diff --git a/[admin]/admin/server/admin_serverprefs.lua b/[admin]/admin/server/admin_serverprefs.lua
index 8f4e45a6a..5692cc9ed 100644
--- a/[admin]/admin/server/admin_serverprefs.lua
+++ b/[admin]/admin/server/admin_serverprefs.lua
@@ -13,14 +13,17 @@
---------------------------------------------------------------------------
function cachePrefs()
g_Prefs = {}
- g_Prefs.maxmsgs = getNumber('maxmsgs',99)
- g_Prefs.bandurations = getString('bandurations','60,3600,43200,0')
- g_Prefs.mutedurations = getString('mutedurations','60,120,300,600,0')
+ g_Prefs.maxmsgs = getNumber('maxmsgs',99)
+ g_Prefs.bandurations = getString('bandurations','60,3600,43200,0')
+ g_Prefs.mutedurations = getString('mutedurations','60,120,300,600,0')
g_Prefs.reportCategories = getString('reportCategories','Question,Suggestion,Other')
g_Prefs.playerReportCategories = getString('playerReportCategories','Cheater/Modder,Spammer')
- g_Prefs.clientcheckban = getBool('clientcheckban',false)
- g_Prefs.securitylevel = getNumber('securitylevel',2)
- g_Prefs.maxchatmsgs = getNumber('maxchatmsgs',10)
+ g_Prefs.fakePacketsIPban = getBool('fakePacketsIPban',false)
+ g_Prefs.fakePacketsSerialban = getBool('fakePacketsSerialban',false)
+ g_Prefs.fakePacketsIPbanLength = getNumber('fakePacketsIPbanLength',86400)
+ g_Prefs.fakePacketsSerialbanLength = getNumber('fakePacketsSerialbanLength',86400)
+ g_Prefs.securitylevel = getNumber('securitylevel',2)
+ g_Prefs.maxchatmsgs = getNumber('maxchatmsgs',10)
triggerClientEvent( root, "onClientUpdatePrefs", resourceRoot, g_Prefs )
end
diff --git a/[admin]/admin/server/admin_sync.lua b/[admin]/admin/server/admin_sync.lua
index 448aef16c..bee57e357 100644
--- a/[admin]/admin/server/admin_sync.lua
+++ b/[admin]/admin/server/admin_sync.lua
@@ -58,6 +58,9 @@ function aSynchCoroutineFunc( type, data, typeOfTag, banSearchTag )
end
end
elseif ( type == "resources" ) then
+ if not hasObjectPermissionTo( source, "general.tab_resources" ) then
+ return
+ end
local resourceTable = getResources()
local tick = getTickCount()
local antiCorMessageSpam = 0
diff --git a/[admin]/admin2/admin_definitions.lua b/[admin]/admin2/admin_definitions.lua
index 6d84fcbe1..9e7951eb5 100644
--- a/[admin]/admin2/admin_definitions.lua
+++ b/[admin]/admin2/admin_definitions.lua
@@ -37,7 +37,7 @@ enum(
"EVENT_RESOURCE",
"EVENT_SERVER",
"EVENT_MESSAGE",
- "EVENT_BANS",
+ "EVENT_BAN",
"EVENT_NETWORK",
"EVENT_PROXY",
"EVENT_ADMIN_CHAT",
@@ -62,6 +62,7 @@ enum(
"SYNC_RESOURCE",
"SYNC_ADMINS",
"SYNC_SERVER",
+ "SYNC_BAN",
"SYNC_BANS",
"SYNC_MESSAGES"
},
diff --git a/[admin]/admin2/client/main/admin.lua b/[admin]/admin2/client/main/admin.lua
index c8ce5c334..142aeffb0 100644
--- a/[admin]/admin2/client/main/admin.lua
+++ b/[admin]/admin2/client/main/admin.lua
@@ -34,6 +34,7 @@ addEventHandler(
aAdminMain.Close(false)
else
aAdminMain.Open()
+ guiFocus (aAdminMain.Form)
end
end
)
diff --git a/[admin]/admin2/client/main/admin_acl.lua b/[admin]/admin2/client/main/admin_acl.lua
index 706a5f051..833e4b1f7 100644
--- a/[admin]/admin2/client/main/admin_acl.lua
+++ b/[admin]/admin2/client/main/admin_acl.lua
@@ -11,7 +11,8 @@ aAclTab = {
Cache = {
Groups = {},
ACL = {},
- Users = {}
+ Users = {},
+ Resources = {},
}
}
@@ -44,6 +45,15 @@ function aAclTab.Create(tab)
-- resources tab
aAclTab.ResourcesTab = guiCreateTab("Resources", aAclTab.Panel)
+ aAclTab.Resources = guiCreateGridList(0.01, 0.07, 0.98, 0.91, true, aAclTab.ResourcesTab)
+ guiGridListAddColumn(aAclTab.Resources, "Name", 1)
+ aAclTab.ResourcesSearch = guiCreateEdit(0.01, 0.0125, 0.3, 0.05, "", true, aAclTab.ResourcesTab)
+ guiCreateInnerImage("client\\images\\search.png", aAclTab.ResourcesSearch)
+ guiHandleInput(aAclTab.ResourcesSearch)
+
+ aAclTab.ResourcesButton_AddResource = guiCreateButton(0.55, 0.0125, 0.2, 0.05, "Add Resource", true, aAclTab.ResourcesTab)
+ aAclTab.ResourcesButton_RemoveResource = guiCreateButton(0.775, 0.0125, 0.2, 0.05, "Remove Resource", true, aAclTab.ResourcesTab)
+
-- rights tab
aAclTab.RightsTab = guiCreateTab("Rights", aAclTab.Panel)
@@ -66,6 +76,7 @@ function aAclTab.Create(tab)
addEventHandler("onClientGUIClick", aAclTab.Tab, aAclTab.onClick)
addEventHandler("onClientGUIChanged", aAclTab.AccessSearch, aAclTab.onChanged)
addEventHandler("onClientGUIChanged", aAclTab.UsersSearch, aAclTab.onChanged)
+ addEventHandler('onClientGUIChanged', aAclTab.ResourcesSearch, aAclTab.onChanged)
end
aAclTab.SyncFunctions = {
@@ -95,6 +106,17 @@ aAclTab.SyncFunctions = {
end
aAclTab.RefreshUsersList()
+ end,
+ [ACL_RESOURCES] = function(group, data)
+ guiGridListClear(aAclTab.Resources)
+ aAclTab.Cache.Resources[group] = {}
+
+ for id,object in ipairs(data) do
+ local obj = object:gsub('resource.','')
+ table.insert(aAclTab.Cache.Resources[group], obj)
+ end
+
+ aAclTab.RefreshResourcesList()
end
}
@@ -110,6 +132,7 @@ function aAclTab.onClick(key, state)
if (source == aAclTab.Groups) then
aAclTab.RefreshAccess()
aAclTab.RefreshUsersList()
+ aAclTab.RefreshResourcesList()
elseif (source == aAclTab.ViewTypes) then
aAclTab.RefreshAccess()
elseif (source == aAclTab.UsersButton_RemoveUser) then
@@ -147,6 +170,41 @@ function aAclTab.onClick(key, state)
else
messageBox("No group selected!", MB_ERROR, MB_OK)
end
+ elseif (source == aAclTab.ResourcesButton_AddResource) then
+ local selected = guiGridListGetSelectedItem(aAclTab.Groups)
+
+ if (selected ~= -1) then
+ local name = inputBox("Add resource", "Enter resource name")
+
+ if (name) then
+ local group = guiGridListGetItemText(aAclTab.Groups, selected, 1)
+ triggerServerEvent(EVENT_ACL, localPlayer, ACL_RESOURCES, ACL_ADD, group, name)
+
+ aAclTab.Cache.Resources[group] = nil
+ aAclTab.RefreshResourcesList()
+ end
+ else
+ messageBox("No group selected!", MB_ERROR, MB_OK)
+ end
+ elseif (source == aAclTab.ResourcesButton_RemoveResource) then
+ local selected = guiGridListGetSelectedItem(aAclTab.Resources)
+
+ if (selected ~= -1) then
+ local object = guiGridListGetItemText(aAclTab.Resources, selected, 1)
+ local selectedGroup = guiGridListGetSelectedItem(aAclTab.Groups)
+ local group = guiGridListGetItemText(aAclTab.Groups, selectedGroup, 1)
+
+ local result = messageBox("Are you sure you want to remove the resource '"..object.."' from the '"..group.."' ACL group?", MB_QUESTION, MB_YESNO)
+
+ if (result) then
+ triggerServerEvent(EVENT_ACL, localPlayer, ACL_RESOURCES, ACL_REMOVE, group, 'resource.'..object)
+
+ aAclTab.Cache.Resources[group] = nil
+ aAclTab.RefreshResourcesList()
+ end
+ else
+ messageBox("No resource selected!", MB_ERROR, MB_OK)
+ end
end
end
@@ -155,6 +213,8 @@ function aAclTab.onChanged()
aAclTab.RefreshAccess()
elseif (source == aAclTab.UsersSearch) then
aAclTab.RefreshUsersList()
+ elseif (source == aAclTab.ResourcesSearch) then
+ aAclTab.RefreshResourcesList()
end
end
@@ -262,4 +322,29 @@ function aAclTab.RefreshUsersList()
triggerServerEvent(EVENT_ACL, localPlayer, ACL_USERS,ACL_GET, group)
end
end
+end
+
+function aAclTab.RefreshResourcesList()
+ local selected = guiGridListGetSelectedItem(aAclTab.Groups)
+
+ if (selected ~= -1) then
+ guiGridListClear(aAclTab.Resources)
+
+ local group = guiGridListGetItemText(aAclTab.Groups, selected, 1)
+ local cache = aAclTab.Cache.Resources[group]
+ if (cache and #cache > 0) then
+ local searchText = guiGetText(aAclTab.ResourcesSearch):lower()
+ local search = searchText:gsub(' ','') ~= ''
+
+ for i,resource in ipairs(cache) do
+ local row = guiGridListAddRow(aAclTab.Resources)
+
+ if ((search and (resource:gsub('resource.',''):lower():find(searchText))) or not search) then
+ guiGridListSetItemText(aAclTab.Resources, row, 1, resource, false, false)
+ end
+ end
+ else
+ triggerServerEvent(EVENT_ACL, localPlayer, ACL_RESOURCES, ACL_GET, group)
+ end
+ end
end
\ No newline at end of file
diff --git a/[admin]/admin2/client/main/admin_bans.lua b/[admin]/admin2/client/main/admin_bans.lua
index b4417eb4b..8852c44be 100644
--- a/[admin]/admin2/client/main/admin_bans.lua
+++ b/[admin]/admin2/client/main/admin_bans.lua
@@ -21,12 +21,11 @@ function aBansTab.Create(tab)
guiGridListAddColumn(aBansTab.BansList, "Name", 0.22)
guiGridListAddColumn(aBansTab.BansList, "IP", 0.25)
guiGridListAddColumn(aBansTab.BansList, "Serial", 0.25)
- guiGridListAddColumn(aBansTab.BansList, "Username", 0.25)
- guiGridListAddColumn(aBansTab.BansList, "Date", 0.17)
+ guiGridListAddColumn(aBansTab.BansList, "Expires", 0.17)
guiGridListAddColumn(aBansTab.BansList, "Banned by", 0.22)
- guiGridListAddColumn(aBansTab.BansList, "Temporary", 0.22)
aBansTab.Details = guiCreateButton(0.82, 0.07, 0.17, 0.04, "Details", true, aBansTab.Tab)
- aBansTab.Unban = guiCreateButton(0.82, 0.12, 0.17, 0.04, "Unban", true, aBansTab.Tab, "unban")
+ aBansTab.Ban = guiCreateButton(0.82, 0.12, 0.17, 0.04, "Add ban", true, aBansTab.Tab, "ban")
+ aBansTab.Unban = guiCreateButton(0.82, 0.17, 0.17, 0.04, "Unban", true, aBansTab.Tab, "unban")
aBansTab.BansRefresh = guiCreateButton(0.82, 0.94, 0.17, 0.04, "Refresh", true, aBansTab.Tab, "listbans")
addEventHandler("onClientGUIChanged", aBansTab.BansListSearch, aBansTab.onBansListSearch)
@@ -41,26 +40,21 @@ function aBansTab.onClientClick(button)
if (button == "left") then
if (source == aBansTab.Details) then
if (guiGridListGetSelectedItem(aBansTab.BansList) == -1) then
- messageBox("No ban row selected!", MB_ERROR, MB_OK)
+ messageBox("No ban selected!", MB_ERROR, MB_OK)
else
- local ip = guiGridListGetItemText(aBansTab.BansList, guiGridListGetSelectedItem(aBansTab.BansList), 2)
- aBanDetails(ip)
+ local banID =
+ guiGridListGetItemData(aBansTab.BansList, guiGridListGetSelectedItem(aBansTab.BansList), 1)
+ aBanDetails.Show(banID, false)
end
+ elseif source == aBansTab.Ban then
+ aBan.Show()
elseif (source == aBansTab.Unban) then
if (guiGridListGetSelectedItem(aBansTab.BansList) == -1) then
- messageBox("No ban row selected!", MB_ERROR, MB_OK)
+ messageBox("No ban selected!", MB_ERROR, MB_OK)
else
- local selected =
- guiGridListGetItemText(aBansTab.BansList, guiGridListGetSelectedItem(aBansTab.BansList), 2)
- if (aBans["Serial"][selected]) then
- if (messageBox("Unban Serial " .. selected .. "?", MB_QUESTION, MB_YESNO ) == true) then
- triggerServerEvent ( "aBans", localPlayer, "unbanserial", selected )
- end
- else
- if (messageBox("Unban IP " .. selected .. "?", MB_QUESTION, MB_YESNO) == true) then
- triggerServerEvent ( "aBans", localPlayer, "unbanip", selected )
- end
- end
+ local banID =
+ guiGridListGetItemData(aBansTab.BansList, guiGridListGetSelectedItem(aBansTab.BansList), 1)
+ aBanDetails.Show(banID, true)
end
elseif (source == aBansTab.BansRefresh) then
guiGridListClear(aBansTab.BansList)
@@ -80,7 +74,6 @@ function aBansTab.onBansListSearch()
((ban.nick and string.find(string.upper(ban.nick), text)) or
(ban.ip and string.find(string.upper(ban.ip), text)) or
(ban.serial and string.find(string.upper(ban.serial), text)) or
- (ban.username and string.find(string.upper(ban.username), text)) or
(ban.banner and string.find(string.upper(ban.banner), text)))
then
aBansTab.AddRow(id, ban)
@@ -117,29 +110,20 @@ function aBansTab.AddRow(id, data)
guiGridListSetItemText(list, row, 1, data.nick or "Unknown", false, false)
guiGridListSetItemText(list, row, 2, data.ip or "", false, false)
guiGridListSetItemText(list, row, 3, data.serial or "", false, false)
- guiGridListSetItemText(list, row, 4, data.username or "", false, false)
- if (data.time) then
- local time = getRealTime(data.time)
- guiGridListSetItemText(
- list,
- row,
- 5,
- time.monthday .. " " .. getMonthName(time.month) .. " " .. (1900 + time.year),
- false,
- false
- )
+ if (data.unban) then
+ guiGridListSetItemText(list, row, 4, formatDate("m/d/y h:m", nil, data.unban), false, false)
else
- guiGridListSetItemText(list, row, 5, "", false, false)
+ guiGridListSetItemText(list, row, 4, "Never", false, false)
end
- guiGridListSetItemText(list, row, 6, data.banner or "", false, false)
- guiGridListSetItemText(list, row, 7, iif(data.unban, "Yes", "No"), false, false)
+ guiGridListSetItemText(list, row, 5, data.banner or "", false, false)
guiGridListSetItemData(list, row, 1, id)
end
function aBansTab.DeleteRow(id)
local list = aBansTab.BansList
- for i = 1, guiGridListGetRowCount(list) do
+ -- GridList row ids start at zero, not one
+ for i = 0, guiGridListGetRowCount(list) do
local data = guiGridListGetItemData(list, i, 1)
if (data == id) then
guiGridListRemoveRow(list, i)
diff --git a/[admin]/admin2/client/main/admin_players.lua b/[admin]/admin2/client/main/admin_players.lua
index 2127e0700..3aeb0afe0 100644
--- a/[admin]/admin2/client/main/admin_players.lua
+++ b/[admin]/admin2/client/main/admin_players.lua
@@ -168,10 +168,7 @@ function aPlayersTab.onClientClick(button)
triggerServerEvent("aPlayer", localPlayer, player, "kick", reason)
end
elseif (source == aPlayersTab.Ban) then
- local reason = inputBox("Ban player " .. name, "Enter the ban reason")
- if (reason) then
- triggerServerEvent("aPlayer", localPlayer, player, "ban", reason)
- end
+ aBan.Show(player)
elseif (source == aPlayersTab.Slap) then
triggerServerEvent("aPlayer", localPlayer, player, "slap",
guiComboBoxGetItemText(aPlayersTab.SlapOptions, guiComboBoxGetSelected(aPlayersTab.SlapOptions))
diff --git a/[admin]/admin2/client/main/admin_server.lua b/[admin]/admin2/client/main/admin_server.lua
index c4de3ac4c..5c527776c 100644
--- a/[admin]/admin2/client/main/admin_server.lua
+++ b/[admin]/admin2/client/main/admin_server.lua
@@ -33,7 +33,9 @@ aServerTab = {
UnderWorldWarp = 'Under World Warp',
VehiclesSunGlare = "Vehicles Sun Glare",
CoronaZTest = "Corona Z Test",
- WaterCreatures = "Water Creatures"
+ WaterCreatures = "Water Creatures",
+ BurnFlippedCars = "Burn Flipped Cars",
+ FireBallDestruct = "Fire Ball Destruct"
}
}
@@ -104,46 +106,56 @@ function aServerTab.Create(tab)
aServerTab.FPS = guiCreateEdit(0.35, 0.710, 0.135, 0.04, fpsLimit, true, tab)
aServerTab.FPSSet = guiCreateButton(0.50, 0.710, 0.10, 0.04, "Set", true, tab, "setfpslimit")
- guiCreateHeader(0.02, 0.755, 0.30, 0.035, "Automatic scripts:", true, tab)
+ aServerTab.ServerConf = guiCreateLabel(0.03, 0.755, 0.25, 0.035, "Server configuration", true, tab)
+ aServerTab.ServerConfSet = guiCreateButton(0.35, 0.755, 0.25, 0.04, "Change", true, tab, "setserverconf")
+ aServerConfig.Open()
+
+ guiCreateHeader(0.02, 0.8, 0.30, 0.035, "Automatic scripts:", true, tab)
aServerTab.PingKickerCheck =
- guiCreateCheckBox(0.03, 0.800, 0.30, 0.04, "Ping Kicker", false, true, tab, "setpingkicker")
- aServerTab.PingKicker = guiCreateEdit(0.35, 0.800, 0.135, 0.04, "300", true, tab)
- aServerTab.PingKickerSet = guiCreateButton(0.50, 0.800, 0.10, 0.04, "Set", true, tab, "setpingkicker")
+ guiCreateCheckBox(0.03, 0.845, 0.30, 0.04, "Ping Kicker", false, true, tab, "setpingkicker")
+ aServerTab.PingKicker = guiCreateEdit(0.35, 0.845, 0.135, 0.04, "300", true, tab)
+ aServerTab.PingKickerSet = guiCreateButton(0.50, 0.845, 0.10, 0.04, "Set", true, tab, "setpingkicker")
guiSetEnabled(aServerTab.PingKicker, false)
guiSetEnabled(aServerTab.PingKickerSet, false)
aServerTab.FPSKickerCheck =
- guiCreateCheckBox(0.03, 0.845, 0.30, 0.04, "FPS Kicker", false, true, tab, "setfpskicker")
- aServerTab.FPSKicker = guiCreateEdit(0.35, 0.845, 0.135, 0.04, "5", true, tab)
- aServerTab.FPSKickerSet = guiCreateButton(0.50, 0.845, 0.10, 0.04, "Set", true, tab, "setfpskicker")
+ guiCreateCheckBox(0.03, 0.89, 0.30, 0.04, "FPS Kicker", false, true, tab, "setfpskicker")
+ aServerTab.FPSKicker = guiCreateEdit(0.35, 0.89, 0.135, 0.04, "5", true, tab)
+ aServerTab.FPSKickerSet = guiCreateButton(0.50, 0.89, 0.10, 0.04, "Set", true, tab, "setfpskicker")
guiSetEnabled(aServerTab.FPSKicker, false)
guiSetEnabled(aServerTab.FPSKickerSet, false)
aServerTab.IdleKickerCheck =
- guiCreateCheckBox(0.03, 0.890, 0.30, 0.04, "Idle Kicker", false, true, tab, "setidlekicker")
- aServerTab.IdleKicker = guiCreateEdit(0.35, 0.890, 0.135, 0.04, "10", true, tab)
- aServerTab.IdleKickerSet = guiCreateButton(0.50, 0.890, 0.10, 0.04, "Set", true, tab, "setidlekicker")
+ guiCreateCheckBox(0.03, 0.935, 0.30, 0.04, "Idle Kicker", false, true, tab, "setidlekicker")
+ aServerTab.IdleKicker = guiCreateEdit(0.35, 0.935, 0.135, 0.04, "10", true, tab)
+ aServerTab.IdleKickerSet = guiCreateButton(0.50, 0.935, 0.10, 0.04, "Set", true, tab, "setidlekicker")
guiSetEnabled(aServerTab.IdleKicker, false)
guiSetEnabled(aServerTab.IdleKickerSet, false)
- guiCreateHeader(0.65, 0.015, 0.30, 0.035, "Allowed glitches:", true, tab)
- local i = 1
+ guiCreateHeader(0.62, 0.015, 0.30, 0.035, "Glitches & Special world properties:", true, tab)
+
+ aServerTab.Glitches_Properties = guiCreateGridList(0.62, 0.06, 0.37, 0.87, true, tab)
+ guiGridListAddColumn(aServerTab.Glitches_Properties, "Name", 0.8)
+ guiGridListAddColumn(aServerTab.Glitches_Properties, "Enabled", 0.3)
+
+ guiGridListSetItemText(aServerTab.Glitches_Properties, guiGridListAddRow(aServerTab.Glitches_Properties), 1, "Glitches", true, false)
+
for k,v in pairs(aServerTab.glitches) do
- aServerTab[k] = guiCreateCheckBox(0.66, 0.015 + (0.045 * i), 0.40, 0.04, v, false, true, tab, "setglitch")
- guiSetEnabled(aServerTab[k], true)
- i = i + 1
+ aServerTab[k] = guiGridListAddRow(aServerTab.Glitches_Properties)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab[k], 1, v, false, false)
+ guiGridListSetItemData(aServerTab.Glitches_Properties, aServerTab[k], 1, {'setglitch',k:lower()})
end
- local headerPosition = 0.025 + (0.045 * i)
- guiCreateHeader(0.65, headerPosition, 0.30, 0.035, "Special world properties:", true, tab)
- local i2 = 1
+ guiGridListSetItemText(aServerTab.Glitches_Properties, guiGridListAddRow(aServerTab.Glitches_Properties), 1, "Special world properties", true, false)
+
for k,v in pairs(aServerTab.worldproperties) do
- aServerTab[k] = guiCreateCheckBox(0.66, headerPosition + (0.0375 * i2), 0.40, 0.04, v, false, true, tab, 'setworldproperty')
- guiSetEnabled(aServerTab[k], true)
- i2 = i2 + 1
+ aServerTab[k] = guiGridListAddRow(aServerTab.Glitches_Properties)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab[k], 1, v, false, false)
+ guiGridListSetItemData(aServerTab.Glitches_Properties, aServerTab[k], 1, {'setworldproperty',k:lower()})
end
addEventHandler("onClientGUIClick", aServerTab.Tab, aServerTab.onClientClick)
+ addEventHandler("onClientGUIDoubleClick", aServerTab.Glitches_Properties, aServerTab.onClientDoubleClick, false)
addEventHandler('onClientGUIChanged', aServerTab.Tab, aServerTab.onClientChanged)
addEventHandler(EVENT_SYNC, root, aServerTab.onClientSync)
addEventHandler("onAdminRefresh", aServerTab.Tab, aServerTab.onRefresh)
@@ -279,6 +291,8 @@ function aServerTab.onClientClick(button)
else
messageBox("Invalid FPS limit: range is 25 - 32767, or 0 for default.", MB_ERROR, MB_OK)
end
+ elseif (source == aServerTab.ServerConfSet) then
+ aServerConfig.Open()
elseif (source == aServerTab.QuickReload) then
triggerServerEvent(
"aServer",
@@ -451,6 +465,19 @@ function aServerTab.onClientClick(button)
end
end
+function aServerTab.onClientDoubleClick(button)
+ if (button == "left") then
+ local selectedRow = guiGridListGetSelectedItem(aServerTab.Glitches_Properties)
+ if (selectedRow ~= -1) then
+ local rowData = guiGridListGetItemData(aServerTab.Glitches_Properties, selectedRow, 1)
+ if (rowData) then
+ local isEnabled = guiGridListGetItemText(aServerTab.Glitches_Properties, selectedRow, 2) == "√"
+ triggerServerEvent("aServer", localPlayer, rowData[1], rowData[2], iif(not isEnabled, "on", "off"))
+ end
+ end
+ end
+end
+
function aServerTab.onClientChanged()
local actualText = guiGetText(source)
local character = actualText:sub(#actualText, #actualText)
@@ -487,35 +514,38 @@ function aServerTab.onRefresh()
guiSetText(aServerTab.HeatHazeCurrent, "Heat Haze Level: " .. getHeatHaze())
guiSetText(aServerTab.WavesCurrent, "Wave Height: " .. getWaveHeight())
guiSetText(aServerTab.FPSCurrent, "FPS Limit: " .. getFPSLimit())
- guiCheckBoxSetSelected(aServerTab.HoverCars, isWorldSpecialPropertyEnabled("hovercars"))
- guiCheckBoxSetSelected(aServerTab.AirCars, isWorldSpecialPropertyEnabled("aircars"))
- guiCheckBoxSetSelected(aServerTab.ExtraBunny, isWorldSpecialPropertyEnabled("extrabunny"))
- guiCheckBoxSetSelected(aServerTab.ExtraJump, isWorldSpecialPropertyEnabled("extrajump"))
- guiCheckBoxSetSelected(aServerTab.RandomFoliage, isWorldSpecialPropertyEnabled("randomfoliage"))
- guiCheckBoxSetSelected(aServerTab.SniperMoon, isWorldSpecialPropertyEnabled("snipermoon"))
- guiCheckBoxSetSelected(aServerTab.ExtraAirResistance, isWorldSpecialPropertyEnabled("extraairresistance"))
- guiCheckBoxSetSelected(aServerTab.UnderWorldWarp, isWorldSpecialPropertyEnabled("underworldwarp"))
- guiCheckBoxSetSelected(aServerTab.VehiclesSunGlare, isWorldSpecialPropertyEnabled("vehiclesunglare"))
- guiCheckBoxSetSelected(aServerTab.CoronaZTest, isWorldSpecialPropertyEnabled("coronaztest"))
- guiCheckBoxSetSelected(aServerTab.WaterCreatures, isWorldSpecialPropertyEnabled("watercreatures"))
+
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.HoverCars, 2, isWorldSpecialPropertyEnabled("hovercars") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.AirCars, 2, isWorldSpecialPropertyEnabled("AirCars") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.ExtraBunny, 2, isWorldSpecialPropertyEnabled("extrabunny") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.ExtraJump, 2, isWorldSpecialPropertyEnabled("extrajump") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.RandomFoliage, 2, isWorldSpecialPropertyEnabled("randomfoliage") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.SniperMoon, 2, isWorldSpecialPropertyEnabled("snipermoon") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.ExtraAirResistance, 2, isWorldSpecialPropertyEnabled("extraairresistance") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.UnderWorldWarp, 2, isWorldSpecialPropertyEnabled("underworldwarp") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.VehiclesSunGlare, 2, isWorldSpecialPropertyEnabled("vehiclesunglare") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.CoronaZTest, 2, isWorldSpecialPropertyEnabled("coronaztest") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.WaterCreatures, 2, isWorldSpecialPropertyEnabled("watercreatures") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.BurnFlippedCars, 2, isWorldSpecialPropertyEnabled("burnflippedcars") and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.FireBallDestruct, 2, isWorldSpecialPropertyEnabled("fireballdestruct") and "√" or "", false, false)
triggerServerEvent("aServerGlitchRefresh", localPlayer)
end
addEvent("aClientRefresh", true)
addEventHandler("aClientRefresh", localPlayer, function(quickreload, fastmove, fastfire, crouchbug, highcloserangedamage, hitanim, fastsprint, baddrivebyhitbox, quickstand, kickout)
- guiCheckBoxSetSelected(aServerTab.QuickReload, quickreload)
- guiCheckBoxSetSelected(aServerTab.FastMove, fastmove)
- guiCheckBoxSetSelected(aServerTab.FastFire, fastfire)
- guiCheckBoxSetSelected(aServerTab.CrouchBug, crouchbug)
- guiCheckBoxSetSelected(aServerTab.HighCloseRangeDamage, highcloserangedamage)
- guiCheckBoxSetSelected(aServerTab.HitAnim, hitanim)
- guiCheckBoxSetSelected(aServerTab.FastSprint, fastsprint)
- guiCheckBoxSetSelected(aServerTab.BadDrivebyHitBox, baddrivebyhitbox)
- guiCheckBoxSetSelected(aServerTab.QuickStand, quickstand)
- guiCheckBoxSetSelected(aServerTab.KickoutOfVehicle_OnModelReplace, kickout)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.QuickReload, 2, quickreload and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.FastMove, 2, fastmove and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.FastFire, 2, fastfire and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.CrouchBug, 2, crouchbug and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.HighCloseRangeDamage, 2, highcloserangedamage and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.HitAnim, 2, hitanim and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.FastSprint, 2, fastsprint and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.BadDrivebyHitBox, 2, baddrivebyhitbox and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.QuickStand, 2, quickstand and "√" or "", false, false)
+ guiGridListSetItemText(aServerTab.Glitches_Properties, aServerTab.KickoutOfVehicle_OnModelReplace, 2, kickout and "√" or "", false, false)
end)
function getWeatherNameFromID(weather)
return iif(aServerTab.Weathers[weather], aServerTab.Weathers[weather], "Unknown")
-end
+end
\ No newline at end of file
diff --git a/[admin]/admin2/client/widgets/admin_ban.lua b/[admin]/admin2/client/widgets/admin_ban.lua
index 4e726c6ba..cfee8674b 100644
--- a/[admin]/admin2/client/widgets/admin_ban.lua
+++ b/[admin]/admin2/client/widgets/admin_ban.lua
@@ -7,90 +7,271 @@
* Original File by lil_Toady
*
**************************************]]
-aBanForm = nil
-
-function aBanDetails(ip)
- if (aBanForm == nil) then
- local x, y = guiGetScreenSize()
- aBanForm = guiCreateWindow(x / 2 - 130, y / 2 - 150, 260, 300, "Ban Details", false)
- aBanIP = guiCreateLabel(0.03, 0.10, 0.80, 0.09, "", true, aBanForm)
- aBanNick = guiCreateLabel(0.03, 0.20, 0.80, 0.09, "", true, aBanForm)
- aBanDate = guiCreateLabel(0.03, 0.30, 0.80, 0.09, "", true, aBanForm)
- aBanTime = guiCreateLabel(0.03, 0.40, 0.80, 0.09, "", true, aBanForm)
- aBanBanner = guiCreateLabel(0.03, 0.50, 0.80, 0.09, "", true, aBanForm)
- aBanClose = guiCreateButton(0.80, 0.88, 0.17, 0.08, "Close", true, aBanForm)
-
- guiSetVisible(aBanForm, false)
- addEventHandler("onClientGUIClick", aBanForm, aClientBanClick)
- --Register With Admin Form
- aRegister("BanDetails", aBanForm, aBanDetails, aBanDetailsClose)
- end
- if (aBans["IP"][ip]) then
- guiSetText(aBanIP, "IP: " .. ip)
- guiSetText(aBanNick, "Nickname: " .. iif(aBans["IP"][ip]["nick"], aBans["IP"][ip]["nick"], "Unknown"))
- guiSetText(aBanDate, "Date: " .. iif(aBans["IP"][ip]["date"], aBans["IP"][ip]["date"], "Unknown"))
- guiSetText(aBanTime, "Time: " .. iif(aBans["IP"][ip]["time"], aBans["IP"][ip]["time"], "Unknown"))
- guiSetText(aBanBanner, "Bant by: " .. iif(aBans["IP"][ip]["banner"], aBans["IP"][ip]["banner"], "Unknown"))
- if (aBanReason) then
- destroyElement(aBanReason)
+aBan = {
+ Form = nil,
+ defaultDurations = {
+ {"1 second", 1},
+ {"1 hour", 60 * 60},
+ {"1 day", 60 * 60 * 24},
+ {"1 week", 60 * 60 * 24 * 7},
+ {"Permanent", 0}, -- HARDCODED AS SECOND LAST IN THIS TABLE, DO NOT MOVE
+ {"Custom", 0} -- HARDCODED AS LAST IN THIS TABLE, DO NOT MOVE
+ },
+ playerName = nil
+}
+
+function aBan.Show(player)
+ if not aBan.Form then
+ aBan.Create()
+ end
+
+ -- If a player was selected, auto-fill the form with the player's info
+ if player then
+ aBan.playerName = getPlayerName(player)
+ guiSetText(aBan.Form, "Ban player "..aBan.playerName)
+ guiSetText(aBan.SerialEditBox, getSensitiveText(aPlayers[player].serial))
+ guiSetEnabled(aBan.SerialEditBox, false)
+ guiSetText(aBan.IPEditBox, getSensitiveText(aPlayers[player].ip))
+ guiSetEnabled(aBan.IPEditBox, false)
+ end
+
+ addEventHandler("onClientGUIClick", aBan.Form, aBan.onClick)
+ addEventHandler("onClientGUIFocus", aBan.Form, aBan.onFocus)
+ addEventHandler("onClientGUIBlur", aBan.Form, aBan.onBlur)
+ guiSetVisible(aBan.Form, true)
+ guiBringToFront(aBan.Form)
+end
+
+function aBan.Close(destroy)
+ if destroy then
+ destroyElement(aBan.Form)
+ aBan.Form = nil
+ else
+ removeEventHandler("onClientGUIClick", aBan.Form, aBan.onClick)
+ guiSetVisible(aBan.Form, false)
+ aBan.Reset()
+ end
+ aBan.playerName = nil
+end
+
+function aBan.Create()
+ local sx, sy = guiGetScreenSize()
+ aBan.Form = guiCreateWindow(sx / 2 - 175, sy / 2 - 170, 350, 340, "Add ban", false)
+ aBan.ReasonLabel = guiCreateLabel(25, 40, 300, 20, "Ban reason (required):", false, aBan.Form)
+ aBan.ReasonEditBox = guiCreateEdit(25, 70, 300, 30, "Enter ban reason...", false, aBan.Form)
+ aBan.ReasonEditBoxRecievedInput = false
+ aBan.DurationLabel = guiCreateLabel(25, 110, 300, 20, "Ban duration (required):", false, aBan.Form)
+ aBan.DurationComboBox = guiCreateComboBox(25, 145, 150, 100, "Select ban duration...", false, aBan.Form)
+ for i=1, #aBan.defaultDurations do
+ guiComboBoxAddItem(aBan.DurationComboBox, aBan.defaultDurations[i][1])
+ end
+ aBan.DurationEditBox = guiCreateEdit(175, 140, 150, 30, "Duration (seconds)...", false, aBan.Form)
+ guiSetEnabled(aBan.DurationEditBox, false)
+ aBan.DurationEditBoxRecievedInput = false
+ aBan.IdentifiersLabel = guiCreateLabel(25, 180, 300, 20, "Select identifiers to use (select at least 1):", false, aBan.Form)
+ aBan.IPCheckBox = guiCreateCheckBox(45, 210, 125, 30, "Use IP address", true, false, aBan.Form)
+ aBan.IPEditBox = guiCreateEdit(175, 210, 150, 30, "Enter IP address...", false, aBan.Form)
+ aBan.IPEditBoxRecievedInput = false
+ aBan.SerialCheckBox = guiCreateCheckBox(45, 250, 125, 30, "Use MTA serial", true, false, aBan.Form)
+ aBan.SerialEditBox = guiCreateEdit(175, 250, 150, 30, "Enter MTA serial...", false, aBan.Form)
+ guiEditSetMaxLength(aBan.SerialEditBox, 32)
+ aBan.SerialEditBoxRecievedInput = false
+ aBan.SubmitButton = guiCreateButton(105, 290, 60, 40, "Submit", false, aBan.Form)
+ aBan.CancelButton = guiCreateButton(185, 290, 60, 40, "Cancel", false, aBan.Form)
+ aRegister("Ban", aBan.Form, aBan.Show, aBan.Close)
+ guiSetVisible(aBan.Form, false)
+end
+
+function aBan.Reset()
+ guiSetText(aBan.Form, "Add ban")
+ guiSetText(aBan.ReasonEditBox, "Enter ban reason...")
+ aBan.ReasonEditBoxRecievedInput = false
+ guiComboBoxSetSelected(aBan.DurationComboBox, -1)
+ guiSetText(aBan.DurationEditBox, "Duration (seconds)...")
+ guiSetEnabled(aBan.DurationEditBox, false)
+ aBan.DurationEditBoxRecievedInput = false
+ guiCheckBoxSetSelected(aBan.IPCheckBox, true)
+ guiSetText(aBan.IPEditBox, "Enter IP address")
+ guiSetEnabled(aBan.IPEditBox, true)
+ aBan.IPEditBoxRecievedInput = false
+ guiCheckBoxSetSelected(aBan.SerialCheckBox, true)
+ guiSetText(aBan.SerialEditBox, "Enter MTA serial...")
+ guiSetEnabled(aBan.SerialEditBox, true)
+ aBan.SerialEditBoxRecievedInput = false
+end
+
+function aBan.onClick(button, state)
+ if not (button == "left" and state == "up") then
+ return
+ end
+
+ -- Handle cancel button first
+ if source == aBan.CancelButton then
+ aBan.Close()
+ return
+ end
+
+ -- Autofill and enable/disable duration editbox based on choice
+ if source == aBan.DurationComboBox then
+ local selected = guiComboBoxGetSelected(aBan.DurationComboBox)
+ if selected == -1 then
+ return
+ elseif selected == #aBan.defaultDurations - 2 then
+ -- Second-last option is permanent duration - clear and disable edit box
+ guiSetText(aBan.DurationEditBox, "")
+ guiSetEnabled(aBan.DurationEditBox, false)
+ elseif selected == #aBan.defaultDurations - 1 then
+ -- Last option (should) be custom duration - enable duration edit box
+ guiSetText(aBan.DurationEditBox, "Duration (seconds)...")
+ guiSetEnabled(aBan.DurationEditBox, true)
+ aBan.DurationEditBoxRecievedInput = false
+ else
+ guiSetText(aBan.DurationEditBox, aBan.defaultDurations[selected + 1][2])
+ guiSetEnabled(aBan.DurationEditBox, false)
+ end
+ return
+ end
+
+ -- Toggle IP/serial fields based on corresponding checkboxes
+ if source == aBan.IPCheckBox and (not aBan.playerName) then
+ guiSetEnabled(aBan.IPEditBox, guiCheckBoxGetSelected(source))
+ return
+ elseif source == aBan.SerialCheckBox and (not aBan.playerName) then
+ guiSetEnabled(aBan.SerialEditBox, guiCheckBoxGetSelected(source))
+ return
+ end
+
+ -- Handle submit button
+ if source == aBan.SubmitButton then
+ aBan.verifyForm()
+ return
+ end
+end
+
+function aBan.onFocus()
+ -- Clear reason/duration/IP/serial edit boxes on first click
+ if source == aBan.ReasonEditBox then
+ if not aBan.ReasonEditBoxRecievedInput then
+ guiSetText(aBan.ReasonEditBox, "")
+ aBan.ReasonEditBoxRecievedInput = true
end
- aBanReason =
- guiCreateLabel(
- 0.03,
- 0.60,
- 0.80,
- 0.30,
- "Reason: " .. iif(aBans["IP"][ip]["reason"], aBans["IP"][ip]["reason"], "Unknown"),
- true,
- aBanForm
- )
- guiLabelSetHorizontalAlign(aBanReason, 4)
- guiSetVisible(aBanForm, true)
- guiBringToFront(aBanForm)
- elseif (aBans["Serial"][ip]) then
- guiSetText(aBanIP, "Serial: " .. ip)
- guiSetText(aBanNick, "Nickname: " .. iif(aBans["Serial"][ip]["nick"], aBans["Serial"][ip]["nick"], "Unknown"))
- guiSetText(aBanDate, "Date: " .. iif(aBans["Serial"][ip]["date"], aBans["Serial"][ip]["date"], "Unknown"))
- guiSetText(aBanTime, "Time: " .. iif(aBans["Serial"][ip]["time"], aBans["Serial"][ip]["time"], "Unknown"))
- guiSetText(
- aBanBanner,
- "Bant by: " .. iif(aBans["Serial"][ip]["banner"], aBans["Serial"][ip]["banner"], "Unknown")
- )
- if (aBanReason) then
- destroyElement(aBanReason)
+ elseif source == aBan.DurationEditBox then
+ if not aBan.DurationEditBoxRecievedInput then
+ guiSetText(aBan.DurationEditBox, "")
+ aBan.DurationEditBoxRecievedInput = true
+ end
+ elseif source == aBan.IPEditBox then
+ if not aBan.IPEditBoxRecievedInput then
+ guiSetText(aBan.IPEditBox, "")
+ aBan.IPEditBoxRecievedInput = true
+ end
+ elseif source == aBan.SerialEditBox then
+ if not aBan.SerialEditBoxRecievedInput then
+ guiSetText(aBan.SerialEditBox, "")
+ aBan.SerialEditBoxRecievedInput = true
end
- aBanReason =
- guiCreateLabel(
- 0.03,
- 0.60,
- 0.80,
- 0.30,
- "Reason: " .. iif(aBans["Serial"][ip]["reason"], aBans["Serial"][ip]["reason"], "Unknown"),
- true,
- aBanForm
- )
- guiLabelSetHorizontalAlign(aBanReason, 4)
- guiSetVisible(aBanForm, true)
- guiBringToFront(aBanForm)
end
end
-function aBanDetailsClose(destroy)
- if ((destroy) or (guiCheckBoxGetSelected(aPerformanceBan))) then
- if (aBanForm) then
- removeEventHandler("onClientGUIClick", aBanForm, aClientBanClick)
- destroyElement(aBanForm)
- aBanForm = nil
+function aBan.onBlur()
+ -- Reset default text of reason/duration/IP/serial edit boxes if they lose focus with no input
+ if source == aBan.ReasonEditBox then
+ if guiGetText(source) == "" then
+ guiSetText(aBan.ReasonEditBox, "Enter ban reason...")
+ aBan.ReasonEditBoxRecievedInput = false
+ end
+ elseif source == aBan.DurationEditBox then
+ if guiGetText(source) == "" and (guiComboBoxGetSelected(aBan.DurationComboBox) == #aBan.defaultDurations - 1) then
+ guiSetText(aBan.DurationEditBox, "Duration (seconds)...")
+ aBan.DurationEditBoxRecievedInput = false
+ end
+ elseif source == aBan.IPEditBox then
+ if guiGetText(source) == "" then
+ guiSetText(aBan.IPEditBox, "Enter IP address...")
+ aBan.IPEditBoxRecievedInput = false
+ end
+ elseif source == aBan.SerialEditBox then
+ if guiGetText(source) == "" then
+ guiSetText(aBan.SerialEditBox, "Enter MTA serial...")
+ aBan.SerialEditBoxRecievedInput = false
end
- else
- guiSetVisible(aBanForm, false)
end
end
-function aClientBanClick(button)
- if (button == "left") then
- if (source == aBanClose) then
- aBanDetailsClose(false)
+function aBan.verifyForm()
+ -- Verify ban reason
+ local banReason = guiGetText(aBan.ReasonEditBox)
+ if banReason == "" or (not aBan.ReasonEditBoxRecievedInput) then
+ messageBox("No ban reason provided.", MB_ERROR, MB_OK)
+ return
+ end
+
+ -- Verify ban duration
+ local banDuration
+ local durationSelection = guiComboBoxGetSelected(aBan.DurationComboBox)
+ if durationSelection == -1 then
+ messageBox("No ban duration provided.", MB_ERROR, MB_OK)
+ return
+ end
+ durationSelection = durationSelection + 1 -- ComboBox item indices starts at 0 instead of one
+ if durationSelection == #aBan.defaultDurations then
+ banDuration = guiGetText(aBan.DurationEditBox)
+ banDuration = tonumber(banDuration)
+ if not banDuration or banDuration <= 0 then
+ messageBox("Invalid ban duration provided.", MB_ERROR, MB_OK)
+ return
+ end
+ else
+ banDuration = aBan.defaultDurations[durationSelection][2]
+ end
+
+ -- Verify ban IP
+ local banIP = ""
+ if guiCheckBoxGetSelected(aBan.IPCheckBox) then
+ banIP = guiGetText(aBan.IPEditBox)
+ if banIP == "" or (not aBan.IPEditBoxRecievedInput) then
+ if not aBan.playerName then
+ messageBox("No IP address provided.", MB_ERROR, MB_OK)
+ return
+ end
+ end
+ end
+
+ -- Verify ban serial
+ local banSerial = ""
+ if guiCheckBoxGetSelected(aBan.SerialCheckBox) then
+ banSerial = guiGetText(aBan.SerialEditBox)
+ if banSerial == "" or (not aBan.SerialEditBoxRecievedInput) or #banSerial ~= 32 then
+ outputDebugString("len = "..#banSerial)
+ if not aBan.playerName then
+ messageBox("Invalid MTA serial provided.", MB_ERROR, MB_OK)
+ return
+ end
+ end
+ end
+
+ -- Show confirmation dialog
+ local confirmationMessage
+ if aBan.playerName then
+ confirmationMessage = "Are you sure you want to ban "..aBan.playerName.."?"
+ else
+ confirmationMessage = "Are you sure you want to add this ban?\nIP = "..(banIP ~= "" and banIP or "None").."\nSerial = "..(banSerial ~= "" and banSerial or "None")
+ end
+
+ if messageBox(confirmationMessage, MB_QUESTION, MB_YESNO) then
+ -- Build ban request "packet" and send to server
+ local actualPlayer -- Actual player may be offline
+ if aBan.playerName then
+ actualPlayer = getPlayerFromName(aBan.playerName)
end
+ local data = {
+ player = actualPlayer,
+ playerName = aBan.playerName,
+ ip = banIP,
+ serial = banSerial,
+ reason = banReason,
+ duration = banDuration
+ }
+ triggerServerEvent(EVENT_BAN, localPlayer, "ban", data)
end
end
diff --git a/[admin]/admin2/client/widgets/admin_ban_details.lua b/[admin]/admin2/client/widgets/admin_ban_details.lua
new file mode 100644
index 000000000..47d3e203c
--- /dev/null
+++ b/[admin]/admin2/client/widgets/admin_ban_details.lua
@@ -0,0 +1,106 @@
+--[[**********************************
+*
+* Multi Theft Auto - Admin Panel
+*
+* client\widgets\admin_ban_details.lua
+*
+**************************************]]
+aBanDetails = {
+ Form = nil,
+ banID = nil
+}
+
+function aBanDetails.Show(banID, showUnban)
+ if not aBanDetails.Form then
+ aBanDetails.Create()
+ end
+
+ aBanDetails.banID = banID
+ local data = aBansTab.List[banID]
+ guiSetText(aBanDetails.NickText, "Player name: "..(data.nick or "Unknown"))
+ guiSetText(aBanDetails.IPText, "IP: "..(data.ip or "None"))
+ guiSetText(aBanDetails.SerialText, "Serial: "..(data.serial or "None"))
+ guiSetText(aBanDetails.ReasonText, "Reason: "..(data.reason or "None"))
+ guiSetText(aBanDetails.AdminText, "Responsible admin: "..(data.banner or "Unknown"))
+ if data.unban then
+ guiSetText(aBanDetails.ExpireText, "Expire time: "..formatDate("m/d/y h:m", nil, data.unban))
+ else
+ guiSetText(aBanDetails.ExpireText, "Expire time: Never")
+ end
+
+ addEventHandler("onClientGUIClick", aBanDetails.Form, aBanDetails.onClick)
+ guiSetVisible(aBanDetails.Form, true)
+
+ -- Toggle visibilty of certain elements if this is being opened as a confimration dialog for unban action
+ if showUnban then
+ guiSetText(aBanDetails.ConfirmationText, "Are you sure you want to remove this ban?")
+ guiSetVisible(aBanDetails.CloseButton, false)
+ guiSetVisible(aBanDetails.SubmitButton, true)
+ guiSetVisible(aBanDetails.CancelButton, true)
+ end
+ guiBringToFront(aBanDetails.Form)
+end
+
+function aBanDetails.Close(destroy)
+ if destroy then
+ destroyElement(aBanDetails.Form)
+ aBanDetails.Form = nil
+ else
+ removeEventHandler("onClientGUIClick", aBanDetails.Form, aBanDetails.onClick)
+ guiSetVisible(aBanDetails.Form, false)
+ aBanDetails.Reset()
+ end
+ aBanDetails.banID = nil
+end
+
+function aBanDetails.Create()
+ local sx, sy = guiGetScreenSize()
+ aBanDetails.Form = guiCreateWindow(sx / 2 - 175, sy / 2 - 135, 350, 250, "Ban Details", false)
+ aBanDetails.ConfirmationText = guiCreateLabel(25, 40, 300, 20, "Ban details:", false, aBanDetails.Form)
+ aBanDetails.NickText = guiCreateLabel(50, 70, 300, 20, "Player name: Unknown", false, aBanDetails.Form)
+ aBanDetails.IPText = guiCreateLabel(50, 90, 300, 20, "IP: None", false, aBanDetails.Form)
+ aBanDetails.SerialText = guiCreateLabel(50, 110, 300, 20, "Serial: None", false, aBanDetails.Form)
+ aBanDetails.ReasonText = guiCreateLabel(50, 130, 300, 20, "Reason: None", false, aBanDetails.Form)
+ aBanDetails.AdminText = guiCreateLabel(50, 150, 300, 20, "Responsible admin: Unknown", false, aBanDetails.Form)
+ aBanDetails.ExpireText = guiCreateLabel(50, 170, 300, 20, "Expire time: Never", false, aBanDetails.Form)
+
+ aBanDetails.SubmitButton = guiCreateButton(105, 200, 60, 40, "Submit", false, aBanDetails.Form)
+ aBanDetails.CancelButton = guiCreateButton(185, 200, 60, 40, "Cancel", false, aBanDetails.Form)
+ aBanDetails.CloseButton = guiCreateButton(145, 200, 60, 40, "Close", false, aBanDetails.Form)
+ guiSetVisible(aBanDetails.CloseButton, true)
+ guiSetVisible(aBanDetails.SubmitButton, false)
+ guiSetVisible(aBanDetails.CancelButton, false)
+ aRegister("Ban Details", aBanDetails.Form, aBanDetails.Show, aBanDetails.Close)
+ guiSetVisible(aBanDetails.Form, false)
+end
+
+function aBanDetails.Reset()
+ guiSetText(aBanDetails.Form, "Ban Details")
+ guiSetText(aBanDetails.ConfirmationText, "Ban details:")
+ guiSetText(aBanDetails.NickText, "Player name: Unknown")
+ guiSetText(aBanDetails.IPText, "IP: None")
+ guiSetText(aBanDetails.SerialText, "Serial: None")
+ guiSetText(aBanDetails.ReasonText, "Reason: None")
+ guiSetText(aBanDetails.AdminText, "Responsible admin: Unknown")
+ guiSetText(aBanDetails.ExpireText, "Expire time: Never")
+ guiSetVisible(aBanDetails.CloseButton, true)
+ guiSetVisible(aBanDetails.SubmitButton, false)
+ guiSetVisible(aBanDetails.CancelButton, false)
+end
+
+function aBanDetails.onClick(button, state)
+ if not (button == "left" and state == "up") then
+ return
+ end
+
+ -- Handle cancel button first
+ if source == aBanDetails.CancelButton or source == aBanDetails.CloseButton then
+ aBanDetails.Close()
+ return
+ end
+
+ if source == aBanDetails.SubmitButton then
+ triggerServerEvent(EVENT_BAN, localPlayer, "unban", aBanDetails.banID)
+ return
+ end
+end
\ No newline at end of file
diff --git a/[admin]/admin2/client/widgets/admin_server_conf.lua b/[admin]/admin2/client/widgets/admin_server_conf.lua
new file mode 100644
index 000000000..9b14827d3
--- /dev/null
+++ b/[admin]/admin2/client/widgets/admin_server_conf.lua
@@ -0,0 +1,213 @@
+--[[**********************************
+*
+* Multi Theft Auto - Admin Panel
+*
+* client\widgets\admin_server_conf.lua
+*
+**************************************]]
+aServerConfig = {
+ Intervals = {
+ player_sync_interval = "Player Sync",
+ lightweight_sync_interval = "Lightweight Sync",
+ camera_sync_interval = "Camera Sync",
+ ped_sync_interval = "Ped Sync",
+ unoccupied_vehicle_sync_interval = "Unoccupied Vehicle Sync",
+ keysync_mouse_sync_interval = "Mouse Key Sync",
+ keysync_analog_sync_interval = "Analog Key Sync",
+ player_triggered_event_interval = "Player Triggered Event"
+ }
+}
+
+function aServerConfig.Open()
+ if (not isElement(aServerConfig.Form)) then
+ local x,y = guiGetScreenSize()
+
+ aServerConfig.Form = guiCreateWindow(x/2 - 240, y/2 - 215, 480, 430, "Server Configuration", false)
+
+ guiCreateHeader(0.05, 0.052, 0.3, 0.04, "Connection:", true, aServerConfig.Form)
+
+ aServerConfig.minVersion = guiCreateLabel(0.1, 0.089, 0.5, 0.04, "Minimum Client Version:", true, aServerConfig.Form)
+ aServerConfig.minVersionField = guiCreateEdit(0.725, 0.089, 0.25, 0.04, "", true, aServerConfig.Form)
+
+ aServerConfig.recVersion = guiCreateLabel(0.1, 0.141, 0.5, 0.04, "Recommended Client Version:", true, aServerConfig.Form)
+ aServerConfig.recVersionField = guiCreateEdit(0.725, 0.141, 0.25, 0.04, "", true, aServerConfig.Form)
+
+ guiCreateHeader(0.05, 0.193, 0.3, 0.04, "Performance:", true, aServerConfig.Form)
+
+ aServerConfig.bandwidth = guiCreateLabel(0.1, 0.23, 0.5, 0.04, "Bandwidth Reduction:", true, aServerConfig.Form)
+
+ aServerConfig.bandwidthCombo = guiCreateComboBox(0.725, 0.23, 0.2, 0.2, "", true, aServerConfig.Form)
+ guiComboBoxAddItem(aServerConfig.bandwidthCombo, "None")
+ guiComboBoxAddItem(aServerConfig.bandwidthCombo, "Medium")
+ guiComboBoxAddItem(aServerConfig.bandwidthCombo, "Maximum")
+
+ aServerConfig.bulletSync = guiCreateLabel(0.1, 0.292, 0.5, 0.04, "Bullet Sync:", true, aServerConfig.Form)
+ aServerConfig.bulletSyncCombo = guiCreateComboBox(0.725, 0.292, 0.2, 0.2, "", true, aServerConfig.Form)
+ guiComboBoxAddItem(aServerConfig.bulletSyncCombo, "False")
+ guiComboBoxAddItem(aServerConfig.bulletSyncCombo, "True")
+
+ aServerConfig.maxTriggers = guiCreateLabel(0.1, 0.354, 0.55, 0.04, "Max player triggered events per interval:", true, aServerConfig.Form)
+ aServerConfig.maxTriggersField = guiCreateEdit(0.725, 0.354, 0.2, 0.04, "", true, aServerConfig.Form)
+ guiEditSetMaxLength(aServerConfig.maxTriggersField, 4)
+
+ guiCreateHeader(0.05, 0.406, 0.3, 0.04, "Intervals:", true, aServerConfig.Form);
+
+ local i = 1
+ local py = 0
+ for k,v in pairs(aServerConfig.Intervals) do
+ py = 0.443 + 0.052 * (i - 1)
+ guiCreateLabel(0.1, py, 0.5, 0.04, v..":", true, aServerConfig.Form)
+
+ aServerConfig[k] = guiCreateEdit(0.725, py, 0.2, 0.04, "", true, aServerConfig.Form)
+ guiEditSetMaxLength(aServerConfig[k], 4)
+ i = i + 1
+ end
+
+ aServerConfig.infoLabel = guiCreateLabel(0, py + 0.052, 1, 0.2, "WARNING\nIf you don't know what you're doing, close this window.", true, aServerConfig.Form)
+ guiLabelSetHorizontalAlign(aServerConfig.infoLabel, "center", true)
+ guiLabelSetColor(aServerConfig.infoLabel, 255,0,0)
+ guiSetFont(aServerConfig.infoLabel, "default-bold-small")
+
+ aServerConfig.saveButton = guiCreateButton(0.25, 0.93, 0.2, 0.1, "Save", true, aServerConfig.Form)
+ aServerConfig.closeButton = guiCreateButton(0.55, 0.93, 0.2, 0.1, "Close", true, aServerConfig.Form)
+
+ guiSetVisible(aServerConfig.Form, false)
+
+ aRegister("ServerConfig", aServerConfig.Form, aServerConfig.Open, aServerConfig.Close)
+ else
+ guiSetVisible(aServerConfig.Form, true)
+ guiBringToFront(aServerConfig.Form)
+ end
+
+ addEventHandler("onClientGUIClick", aServerConfig.Form, aServerConfig.onClientClick)
+ addEventHandler('onClientGUIChanged', aServerConfig.Form, aServerConfig.onClientChanged)
+ addEventHandler("onAdminRefresh", aServerConfig.Form, aServerConfig.Refresh)
+
+ aServerConfig.Refresh()
+end
+
+function aServerConfig.Close(destroy)
+ if (destroy) then
+ destroyElement(aServerConfig.Form)
+ else
+ removeEventHandler('onClientGUIClick', aServerConfig.Form, aServerConfig.onClientClick)
+ removeEventHandler('onClientGUIChanged', aServerConfig.Form, aServerConfig.onClientChanged)
+ removeEventHandler('onAdminRefresh', aServerConfig.Form, aServerConfig.Refresh)
+
+ guiSetVisible(aServerConfig.Form, false)
+ end
+end
+
+function aServerConfig.onClientChanged()
+ local actualText = guiGetText(source)
+ local character = actualText:sub(#actualText, #actualText)
+ if (not tonumber(character) and character ~= '.' and character ~= '-') then
+ guiSetText(source, actualText:sub(0, #actualText - 1))
+ end
+end
+
+function aServerConfig.onClientClick(button)
+ if (button == "left") then
+ if (source == aServerConfig.closeButton) then
+ aServerConfig.Close()
+ elseif (source == aServerConfig.saveButton) then
+ local triggersPerInterval = guiGetText(aServerConfig.maxTriggersField)
+ local cameraSyncInterval = guiGetText(aServerConfig.camera_sync_interval)
+ local playerSyncInterval = guiGetText(aServerConfig.player_sync_interval)
+ local playerTriggeredEventInterval = guiGetText(aServerConfig.player_triggered_event_interval)
+ local keySyncAnalogInterval = guiGetText(aServerConfig.keysync_analog_sync_interval)
+ local keySyncMouseInterval = guiGetText(aServerConfig.keysync_mouse_sync_interval)
+ local pedSyncInterval = guiGetText(aServerConfig.ped_sync_interval)
+ local unoccupiedVehicleSyncInterval = guiGetText(aServerConfig.unoccupied_vehicle_sync_interval)
+ local lightWeightSyncInterval = guiGetText(aServerConfig.lightweight_sync_interval)
+
+ if (#triggersPerInterval <= 0 or tonumber(triggersPerInterval) < 1 or tonumber(triggersPerInterval) > 1000) then
+ messageBox("The range for 'Max player triggered events per interval' is: 1-1000", MB_ERROR, MB_OK)
+ return
+ end
+
+ if (#cameraSyncInterval <= 0 or tonumber(cameraSyncInterval) < 50 or tonumber(cameraSyncInterval) > 4000) then
+ messageBox("The range for 'Camera sync interval' is: 50-4000", MB_ERROR, MB_OK)
+ return
+ end
+
+ if (#playerSyncInterval <= 0 or tonumber(playerSyncInterval) < 50 or tonumber(playerSyncInterval) > 4000) then
+ messageBox("The range for 'Player sync interval' is: 50-4000", MB_ERROR, MB_OK)
+ return
+ end
+
+ if (#playerTriggeredEventInterval <= 0 or tonumber(playerTriggeredEventInterval) < 50 or tonumber(playerTriggeredEventInterval) > 5000) then
+ messageBox("The range for 'Player triggered event interval' is: 50-5000", MB_ERROR, MB_OK)
+ return
+ end
+
+ if (#keySyncAnalogInterval <= 0 or tonumber(keySyncAnalogInterval) < 50 or tonumber(keySyncAnalogInterval) > 4000) then
+ messageBox("The range for 'Analog key sync interval' is: 50-4000", MB_ERROR, MB_OK)
+ return
+ end
+
+ if (#keySyncMouseInterval <= 0 or tonumber(keySyncMouseInterval) < 50 or tonumber(keySyncMouseInterval) > 4000) then
+ messageBox("The range for 'Mouse key sync interval' is: 50-4000", MB_ERROR, MB_OK)
+ return
+ end
+
+ if (#pedSyncInterval <= 0 or tonumber(pedSyncInterval) < 50 or tonumber(pedSyncInterval) > 4000) then
+ messageBox("The range for 'Ped sync interval' is: 50-4000", MB_ERROR, MB_OK)
+ return
+ end
+
+ if (#unoccupiedVehicleSyncInterval <= 0 or tonumber(unoccupiedVehicleSyncInterval) < 50 or tonumber(unoccupiedVehicleSyncInterval) > 4000) then
+ messageBox("The range for 'Unoccupied vehicle sync interval' is: 50-4000", MB_ERROR, MB_OK)
+ return
+ end
+
+ if (#lightWeightSyncInterval <= 0 or tonumber(lightWeightSyncInterval) < 200 or tonumber(lightWeightSyncInterval) > 4000) then
+ messageBox("The range for 'Lightweight sync interval' is: 200-4000", MB_ERROR, MB_OK)
+ return
+ end
+
+ if (messageBox("Are you sure you want to save the server configuration changes?", MB_QUESTION, MB_YESNO)) then
+ triggerServerEvent("aServer", localPlayer, "setconfig", {
+ minclientversion = guiGetText(aServerConfig.minVersionField),
+ recommendedclientversion = guiGetText(aServerConfig.recVersionField),
+ bandwidth_reduction = guiComboBoxGetItemText(aServerConfig.bandwidthCombo, guiComboBoxGetSelected(aServerConfig.bandwidthCombo)):lower() or "medium",
+ bullet_sync = tostring(guiComboBoxGetSelected(aServerConfig.bulletSyncCombo)),
+ max_player_triggered_events_per_interval = triggersPerInterval,
+ camera_sync_interval = cameraSyncInterval,
+ player_sync_interval = playerSyncInterval,
+ player_triggered_event_interval = playerTriggeredEventInterval,
+ keysync_analog_sync_interval = keySyncAnalogInterval,
+ keysync_mouse_sync_interval = keySyncMouseInterval,
+ ped_sync_interval = pedSyncInterval,
+ unoccupied_vehicle_sync_interval = unoccupiedVehicleSyncInterval,
+ lightweight_sync_interval = lightWeightSyncInterval
+ })
+
+ aServerConfig.Close()
+ end
+ end
+ end
+end
+
+function aServerConfig.Refresh()
+ triggerServerEvent("aServerConfigRefresh", localPlayer)
+end
+
+addEvent("aClientConfigRefresh", true)
+addEventHandler("aClientConfigRefresh", localPlayer, function(minclientversion, recommendedclientversion, bandwidthreduction, bulletsync, maxplayertriggers, camerasync_interval, playersync_interval, playertriggers_interval, keysync_analog_interval, keysync_mousse_interval, pedsync_interval, unoccupiedvehicle_interval, lightweight_interval)
+ guiSetText(aServerConfig.minVersionField, minclientversion)
+ guiSetText(aServerConfig.recVersionField, recommendedclientversion)
+
+ guiComboBoxSetSelected(aServerConfig.bandwidthCombo, (bandwidthreduction == "none" and 0 or (bandwidthreduction == "medium" and 1 or 2)) or 0)
+ guiComboBoxSetSelected(aServerConfig.bulletSyncCombo, tonumber(bulletsync))
+
+ guiSetText(aServerConfig.maxTriggersField, maxplayertriggers)
+ guiSetText(aServerConfig.camera_sync_interval, camerasync_interval)
+ guiSetText(aServerConfig.player_sync_interval, playersync_interval)
+ guiSetText(aServerConfig.player_triggered_event_interval, playertriggers_interval)
+ guiSetText(aServerConfig.keysync_analog_sync_interval, keysync_analog_interval)
+ guiSetText(aServerConfig.keysync_mouse_sync_interval, keysync_mousse_interval)
+ guiSetText(aServerConfig.ped_sync_interval, pedsync_interval)
+ guiSetText(aServerConfig.unoccupied_vehicle_sync_interval, unoccupiedvehicle_interval)
+ guiSetText(aServerConfig.lightweight_sync_interval, lightweight_interval)
+end)
\ No newline at end of file
diff --git a/[admin]/admin2/conf/ACL.xml b/[admin]/admin2/conf/ACL.xml
index 7402ff4fc..6ae6e16d6 100644
--- a/[admin]/admin2/conf/ACL.xml
+++ b/[admin]/admin2/conf/ACL.xml
@@ -77,6 +77,7 @@
+
@@ -159,6 +160,7 @@
+
@@ -241,6 +243,7 @@
+
@@ -320,6 +323,7 @@
+
diff --git a/[admin]/admin2/conf/commands.xml b/[admin]/admin2/conf/commands.xml
index e2079d23f..f82266625 100644
--- a/[admin]/admin2/conf/commands.xml
+++ b/[admin]/admin2/conf/commands.xml
@@ -55,10 +55,10 @@
-
+
diff --git a/[admin]/admin2/conf/messages.xml b/[admin]/admin2/conf/messages.xml
index a20321d39..062dd7be5 100644
--- a/[admin]/admin2/conf/messages.xml
+++ b/[admin]/admin2/conf/messages.xml
@@ -11,9 +11,6 @@
$data2 - Additional information, not all the nodes use it.
-->
-
- ADMIN: $admin has banned $player ($data)
-
ADMIN: $admin has kicked $player ($data)
@@ -248,21 +245,15 @@
-
- IP: $data successfully removed from bans list
- ADMIN: $admin has unbanned IP $data
-
-
- SERIAL: $data successfully removed from bans list
- ADMIN: $admin has unbanned Serial $data
+
+ ADMIN: $admin has banned $player ($data)
+ ADMIN: $admin has banned $player ($data)
-
- IP: $data successfully added to bans list
- ADMIN: $admin has banned IP $data
+
+ ADMIN: $admin has added a manual ban (IP = $data, Serial = $data2)
-
- SERIAL: $data successfully added to bans list
- ADMIN: $admin has banned Serial $data
+
+ ADMIN: $admin has removed a ban (IP = $data, Serial = $data2)
diff --git a/[admin]/admin2/meta.xml b/[admin]/admin2/meta.xml
index 8e3c95163..f888ab7b7 100644
--- a/[admin]/admin2/meta.xml
+++ b/[admin]/admin2/meta.xml
@@ -1,113 +1,113 @@
-
-
+
+
+
+
+
-
- WARNING: We give no support for edited
- versions of the admin system.
- -->
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+