vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 07:29:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implement netfilter users list

Browse source 
Also remove "space" from allowed password characters, as it will return a validation error
This commit is contained in:
emanuele-f 2017-12-05 17:08:57 +01:00
parent 337c060e20
commit 4cddc7af53
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/lua/modules/lua_utils.lua
View file

@ -2141,14 +2141,14 @@ function getDefaultTableSort(table_type)
return(value)
end
function getDefaultTableSortOrder(table_type)
function getDefaultTableSortOrder(table_type, force_get)
local table_key = getRedisPrefix("ntopng.prefs.table")
local value = nil
if(table_type ~= nil) then
value = ntop.getHashCache(table_key, "sort_order_"..table_type)
end
if((value == nil) or (value == "")) then value = 'desc' end
if((value == nil) or (value == "")) and (force_get ~= true) then value = 'desc' end
return(value)
end
@ -2159,10 +2159,10 @@ function getDefaultTableSize()
return(tonumber(value))
end
function tablePreferences(key, value)
function tablePreferences(key, value, force_set)
table_key = getRedisPrefix("ntopng.prefs.table")
if((value == nil) or (value == "")) then
if((value == nil) or (value == "")) and (force_set ~= true) then
-- Get preferences
return ntop.getHashCache(table_key, key)
else
@ -2502,7 +2502,7 @@ function maxRateToString(max_rate)
end
function getPasswordInputPattern()
return [[^[\w\$\\!\/\(\)=\?\^\*@_\-\u0000-\u00ff]{5,}$]]
return [[^[\w\$\\!\/\(\)=\?\^\*@_\-\u0000-\u0019\u0021-\u00ff]{5,}$]]
end
function getIPv4Pattern()