Move safeResName and pattern outside the loop for efficiency

Author: Elabyad247

[admin]/admin/server/admin_settings.lua

@@ -27,17 +27,18 @@ function aGetResourceSettings( resName, bCountOnly )
 		return {}, count
 	end
 	local settings = {}
+	-- Escape special characters inside resName
+	local safeResName = string.gsub(resName, '([^%w])', '%%%1')
+	local namePattern = '^' .. safeResName .. '%.(.*)$'
 	-- Parse raw settings
 	for rawname,value in pairs(rawsettings) do
 		if allowedTypes[type(value)] then
 			if allowedAccess[string.sub(rawname,1,1)] then
 				count = count + 1
 				-- Remove leading '*','#' or '@'
 				local temp = string.gsub(rawname, '^[%*%#%@](.*)', '%1')
-				-- Escape special characters inside resName
-				local safeResName = string.gsub(resName, '([^%w])', '%%%1')
 				-- Remove leading 'resName.'
-				local name = string.gsub(temp, '^' .. safeResName .. '%.(.*)$', '%1')
+				local name = string.gsub(temp, namePattern, '%1')
 				-- If name didn't have a leading 'resName.', then it must be the default setting
 				local bIsDefault = ( temp == name )
 				if settings[name] == nil then

[admin]/admin2/server/admin_ACL.lua

@@ -14,7 +14,7 @@ function aSetupACL()
     local node = xmlLoadFile("conf\\ACL.xml")
 
     if (not node) then
-        outputDebugString("Vanilla ACL not found! Please reinstall the admin resource")
+        outputDebugString("Vanilla ACL not found! Please reinstall the admin resource")
         return false
     end
 
@@ -122,14 +122,15 @@ function getResourceSettings(resName, bCountOnly)
         return {}, count
     end
     local settings = {}
+    local safeResName = string.gsub(resName, '([^%w])', '%%%1')
+    local namePattern = '^' .. safeResName .. '%.(.*)$'
 
     for rawname, value in pairs(rawsettings) do
         if (allowedTypes[type(value)]) then
             if allowedAccess[string.sub(rawname, 1, 1)] then
                 count = count + 1
                 local temp = string.gsub(rawname, '^[%*%#%@](.*)', '%1')
-                local safeResName = string.gsub(resName, '([^%w])', '%%%1')
-                local name = string.gsub(temp, '^' .. safeResName .. '%.(.*)$', '%1')
+                local name = string.gsub(temp, namePattern, '%1')
                 local bIsDefault = (temp == name)
                 if (not settings[name]) then
                     settings[name] = {}
@@ -171,7 +172,7 @@ local aACLFunctions = {
         if (action == ACL_ADD) then
             if (name and type(name) == "string") then
                 if (aclCreateGroup(name)) then
-                    messageBox(client, "Successfully created group '" .. name .. "'", MB_INFO)
+                    messageBox(client, "Successfully created group '" .. name .. "'", MB_INFO)
                 else
                     messageBox(client, "Failed to create group '" .. name .. "'", MB_INFO)
                 end
@@ -182,7 +183,7 @@ local aACLFunctions = {
                 if (aclDestroyGroup(name)) then
                     messageBox(client, "Successfully removed group '" .. name .. "'", MB_INFO)
                 else
-                    messageBox(client, "Failed to remove group '" .. name .. "'", MB_INFO)
+                    messageBox(client, "Failed to remove group '" .. name .. "'", MB_INFO)
                 end
             end
             messageBox(client, "Invalid group name", MB_INFO)
@@ -207,13 +208,13 @@ local aACLFunctions = {
             if (aclGroupRemoveObject(aclGetGroup(group), object)) then
                 messageBox(client, "Successfully removed user '"..object:gsub('user.','').."' from the '"..group.."' ACL group", MB_INFO)
             else
-                messageBox(client, "Failed to remove user '"..object:gsub('user.','').."' from the '"..group.."' ACL group", MB_INFO)
+                messageBox(client, "Failed to remove user '"..object:gsub('user.','').."' from the '"..group.."' ACL group", MB_INFO)
             end
         elseif (action == ACL_ADD) then
             if (aclGroupAddObject(aclGetGroup(group), 'user.'..object)) then
                 messageBox(client, "Successfully added user '"..object:gsub('user.','').."' to the '"..group.."' ACL group", MB_INFO)
             else
-                messageBox(client, "Failed to add user '"..object:gsub('user.','').."' to the '"..group.."' ACL group", MB_INFO)
+                messageBox(client, "Failed to add user '"..object:gsub('user.','').."' to the '"..group.."' ACL group", MB_INFO)
             end
         end
     end,
@@ -231,13 +232,13 @@ local aACLFunctions = {
             if (aclGroupRemoveObject(aclGetGroup(group), object)) then
                 messageBox(client, "Successfully removed resource '"..object:gsub('resource.','').."' from the '"..group.."' ACL group", MB_INFO)
             else
-                messageBox(client, "Failed to remove resource '"..object:gsub('resource.','').."' from the '"..group.."' ACL group", MB_INFO)
+                messageBox(client, "Failed to remove resource '"..object:gsub('resource.','').."' from the '"..group.."' ACL group", MB_INFO)
             end
         elseif (action == ACL_ADD) then
             if (aclGroupAddObject(aclGetGroup(group), 'resource.'..object)) then
                 messageBox(client, "Successfully added resource '"..object:gsub('resource.','').."' to the '"..group.."' ACL group", MB_INFO)
             else
-                messageBox(client, "Failed to add resource '"..object:gsub('resource.','').."' to the '"..group.."' ACL group", MB_INFO)
+                messageBox(client, "Failed to add resource '"..object:gsub('resource.','').."' to the '"..group.."' ACL group", MB_INFO)
             end
         end
     end,