Integrated ACL/auth into level commands

luascripts/commands/admin/admintest.lua

@@ -21,7 +21,10 @@ local stats = require "luascripts.wolfadmin.players.stats"
 local settings = require "luascripts.wolfadmin.util.settings"
 
 function commandAdminTest(clientId, cmdArguments)
-    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dadmintest: "..stats.get(clientId, "playerName").." ^9is a level "..auth.getlevel(clientId).." user (".."^7Guest".."^9).\";")
+    local level = auth.getlevel(clientId)
+    local levelName = auth.getlevelname(level)
+
+    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dadmintest: ^7"..stats.get(clientId, "playerName").." ^9is a level "..level.." user (^7"..levelName.."^9).\";")
 
     return true
 end

luascripts/commands/admin/listplayers.lua

@@ -47,6 +47,9 @@ function commandListPlayers(clientId, cmdArguments)
             guidStub = stats.get(player, "playerGUID"):sub(-8)
         end
 
+        local level = auth.getlevel(player)
+        local levelName = auth.getlevelname(level)
+
         local teamColor, teamCode
 
         if et.gentity_get(player, "pers.connected") then
@@ -66,8 +69,8 @@ function commandListPlayers(clientId, cmdArguments)
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^f"..string.format("%2i %s ^7%-2i %20s ^7(*%s) ^1%1s ^3%1s ^7%s ^7%s%s^7%s", 
             player, -- slot
             teamCode, -- team
-            auth.getlevel(player), -- level
-            "Guest", -- levelname
+            level, -- level
+            levelName, -- levelname
             guidStub, -- guid stub
             (stats.get(player, "playerMuted") and "M" or ""), -- muted
             fireteamName, -- fireteam

luascripts/commands/admin/setlevel.lua

@@ -57,7 +57,7 @@ function commandSetLevel(clientId, cmdArguments)
     
     if cmdClient == -1 then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dsetlevel: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
-        
+
         return true
     elseif not et.gentity_get(cmdClient, "pers.netname") then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dsetlevel: ^9no connected player by that name or slot #\";")
@@ -68,10 +68,14 @@ function commandSetLevel(clientId, cmdArguments)
     if auth.getlevel(cmdClient) > auth.getlevel(clientId) then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dsetlevel: ^9sorry, but your intended victim has a higher admin level than you do.\";")
 
+        return true
+    elseif not db.getlevel(tonumber(cmdArguments[2])) then
+        et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dsetlevel: ^9this admin level does not exist.\";")
+
         return true
     end
 
-    cmdArguments[2] = tonumber(cmdArguments[2]) or 0 
+    cmdArguments[2] = tonumber(cmdArguments[2]) or 0
 
     admin.setPlayerLevel(cmdClient, tonumber(cmdArguments[2]), clientId)