Fix #721: handle resource names with special characters in admin settings

Author: Elabyad247

[admin]/admin/server/admin_settings.lua

@@ -33,9 +33,11 @@ function aGetResourceSettings( resName, bCountOnly )
 			if allowedAccess[string.sub(rawname,1,1)] then
 				count = count + 1
 				-- Remove leading '*','#' or '@'
-				local temp = string.gsub(rawname,'[%*%#%@](.*)','%1')
+				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,resName..'%.(.*)','%1')
+				local name = string.gsub(temp, '^' .. safeResName .. '%.(.*)$', '%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

@@ -127,8 +127,9 @@ function getResourceSettings(resName, bCountOnly)
         if (allowedTypes[type(value)]) then
             if allowedAccess[string.sub(rawname, 1, 1)] then
                 count = count + 1
-                local temp = string.gsub(rawname, "[%*%#%@](.*)", "%1")
-                local name = string.gsub(temp, resName .. "%.(.*)", "%1")
+                local temp = string.gsub(rawname, '^[%*%#%@](.*)', '%1')
+                local safeResName = string.gsub(resName, '([^%w])', '%%%1')
+                local name = string.gsub(temp, '^' .. safeResName .. '%.(.*)$', '%1')
                 local bIsDefault = (temp == name)
                 if (not settings[name]) then
                     settings[name] = {}