fix filter for all languages (use utf8 ideally) #7446

Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458
2025-11-24 18:18:44 +00:00
parent db3e3b0273
commit 8a10de47c7
4 changed files with 5888 additions and 6337 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -3094,17 +3094,17 @@
var x = Q('SearchInput').value.toLowerCase().trim(); putstore('_search', Q('SearchInput').value);
QS('SearchInput')['background-color'] = (x == '') ? '#FFFFFF' : '#FDFFBE';
var userSearch = null, ipSearch = null, groupSearch = null, tagSearch = null, agentTagSearch = null, wscSearch = null, osSearch = null, amtSearch = null;
if (x.startsWith("user:".toLowerCase())) { userSearch = x.substring("user:".length); }
else if (x.startsWith("u:".toLowerCase())) { userSearch = x.substring("u:".length); }
else if (x.startsWith("ip:".toLowerCase())) { ipSearch = x.substring("ip:".length); }
else if (x.startsWith("group:".toLowerCase())) { groupSearch = x.substring("group:".length); }
else if (x.startsWith("g:".toLowerCase())) { groupSearch = x.substring("g:".length); }
else if (x.startsWith("tag:".toLowerCase())) { tagSearch = Q('SearchInput').value.trim().substring("tag:".length); }
else if (x.startsWith("t:".toLowerCase())) { tagSearch = Q('SearchInput').value.trim().substring("t:".length); }
else if (x.startsWith("atag:".toLowerCase())) { agentTagSearch = Q('SearchInput').value.trim().substring("atag:".length).toLowerCase(); }
else if (x.startsWith("a:".toLowerCase())) { agentTagSearch = Q('SearchInput').value.trim().substring("a:".length).toLowerCase(); }
else if (x.startsWith("os:".toLowerCase())) { osSearch = Q('SearchInput').value.trim().substring("os:".length).toLowerCase(); }
else if (x.startsWith("amt:".toLowerCase())) { amtSearch = Q('SearchInput').value.trim().substring("amt:".length).toLowerCase(); }
if (x.startsWith('user:'.toLowerCase())) { userSearch = x.substring('user:'.length); }
else if (x.startsWith('u:'.toLowerCase())) { userSearch = x.substring('u:'.length); }
else if (x.startsWith('ip:'.toLowerCase())) { ipSearch = x.substring('ip:'.length); }
else if (x.startsWith('group:'.toLowerCase())) { groupSearch = x.substring('group:'.length); }
else if (x.startsWith('g:'.toLowerCase())) { groupSearch = x.substring('g:'.length); }
else if (x.startsWith('tag:'.toLowerCase())) { tagSearch = Q('SearchInput').value.trim().substring('tag:'.length); }
else if (x.startsWith('t:'.toLowerCase())) { tagSearch = Q('SearchInput').value.trim().substring('t:'.length); }
else if (x.startsWith('atag:'.toLowerCase())) { agentTagSearch = Q('SearchInput').value.trim().substring('atag:'.length).toLowerCase(); }
else if (x.startsWith('a:'.toLowerCase())) { agentTagSearch = Q('SearchInput').value.trim().substring('a:'.length).toLowerCase(); }
else if (x.startsWith('os:'.toLowerCase())) { osSearch = Q('SearchInput').value.trim().substring('os:'.length).toLowerCase(); }
else if (x.startsWith('amt:'.toLowerCase())) { amtSearch = Q('SearchInput').value.trim().substring('amt:'.length).toLowerCase(); }
else if (x == 'wsc:ok') { wscSearch = 1; }
else if (x == 'wsc:noav') { wscSearch = 2; }
else if (x == 'wsc:noupdate') { wscSearch = 3; }

View File

@@ -6337,20 +6337,20 @@
function getDevicesThatMatchFilter(x) {
var r = [];
var userSearch = null, ipSearch = null, groupSearch = null, tagSearch = null, agentTagSearch = null, wscSearch = null, osSearch = null, amtSearch = null, descSearch = null, connectivitySearch = null;
if (x.startsWith("user:".toLowerCase())) { userSearch = x.substring("user:".length); }
else if (x.startsWith("u:".toLowerCase())) { userSearch = x.substring("u:".length); }
else if (x.startsWith("ip:".toLowerCase())) { ipSearch = x.substring("ip:".length); }
else if (x.startsWith("group:".toLowerCase())) { groupSearch = x.substring("group:".length); }
else if (x.startsWith("g:".toLowerCase())) { groupSearch = x.substring("g:".length); }
else if (x.startsWith("tag:".toLowerCase())) { tagSearch = x.substring("tag:".length); }
else if (x.startsWith("t:".toLowerCase())) { tagSearch = x.substring("t:".length); }
else if (x.startsWith("atag:".toLowerCase())) { agentTagSearch = x.substring("atag:".length); }
else if (x.startsWith("a:".toLowerCase())) { agentTagSearch = x.substring("a:".length); }
else if (x.startsWith("os:".toLowerCase())) { osSearch = x.substring("os:".length); }
else if (x.startsWith("amt:".toLowerCase())) { amtSearch = x.substring("amt:".length); }
else if (x.startsWith("desc:".toLowerCase())) { descSearch = x.substring("desc:".length); }
else if (x.startsWith("connectivity:".toLowerCase())) { connectivitySearch = x.substring("connectivity:".length); }
else if (x.startsWith("c:".toLowerCase())) { connectivitySearch = x.substring("c:".length); }
if (x.startsWith('user:'.toLowerCase())) { userSearch = x.substring('user:'.length); }
else if (x.startsWith('u:'.toLowerCase())) { userSearch = x.substring('u:'.length); }
else if (x.startsWith('ip:'.toLowerCase())) { ipSearch = x.substring('ip:'.length); }
else if (x.startsWith('group:'.toLowerCase())) { groupSearch = x.substring('group:'.length); }
else if (x.startsWith('g:'.toLowerCase())) { groupSearch = x.substring('g:'.length); }
else if (x.startsWith('tag:'.toLowerCase())) { tagSearch = x.substring('tag:'.length); }
else if (x.startsWith('t:'.toLowerCase())) { tagSearch = x.substring('t:'.length); }
else if (x.startsWith('atag:'.toLowerCase())) { agentTagSearch = x.substring('atag:'.length); }
else if (x.startsWith('a:'.toLowerCase())) { agentTagSearch = x.substring('a:'.length); }
else if (x.startsWith('os:'.toLowerCase())) { osSearch = x.substring('os:'.length); }
else if (x.startsWith('amt:'.toLowerCase())) { amtSearch = x.substring('amt:'.length); }
else if (x.startsWith('desc:'.toLowerCase())) { descSearch = x.substring('desc:'.length); }
else if (x.startsWith('connectivity:'.toLowerCase())) { connectivitySearch = x.substring('connectivity:'.length); }
else if (x.startsWith('c:'.toLowerCase())) { connectivitySearch = x.substring('c:'.length); }
else if (x == 'wsc:ok') { wscSearch = 1; }
else if (x == 'wsc:noav') { wscSearch = 2; }
else if (x == 'wsc:noupdate') { wscSearch = 3; }

View File

@@ -7213,20 +7213,20 @@
function getDevicesThatMatchFilter(x) {
var r = [];
var userSearch = null, ipSearch = null, groupSearch = null, tagSearch = null, agentTagSearch = null, wscSearch = null, osSearch = null, amtSearch = null, descSearch = null, connectivitySearch = null;
if (x.startsWith("user:".toLowerCase())) { userSearch = x.substring("user:".length); }
else if (x.startsWith("u:".toLowerCase())) { userSearch = x.substring("u:".length); }
else if (x.startsWith("ip:".toLowerCase())) { ipSearch = x.substring("ip:".length); }
else if (x.startsWith("group:".toLowerCase())) { groupSearch = x.substring("group:".length); }
else if (x.startsWith("g:".toLowerCase())) { groupSearch = x.substring("g:".length); }
else if (x.startsWith("tag:".toLowerCase())) { tagSearch = x.substring("tag:".length); }
else if (x.startsWith("t:".toLowerCase())) { tagSearch = x.substring("t:".length); }
else if (x.startsWith("atag:".toLowerCase())) { agentTagSearch = x.substring("atag:".length); }
else if (x.startsWith("a:".toLowerCase())) { agentTagSearch = x.substring("a:".length); }
else if (x.startsWith("os:".toLowerCase())) { osSearch = x.substring("os:".length); }
else if (x.startsWith("amt:".toLowerCase())) { amtSearch = x.substring("amt:".length); }
else if (x.startsWith("desc:".toLowerCase())) { descSearch = x.substring("desc:".length); }
else if (x.startsWith("connectivity:".toLowerCase())) { connectivitySearch = x.substring("connectivity:".length); }
else if (x.startsWith("c:".toLowerCase())) { connectivitySearch = x.substring("c:".length); }
if (x.startsWith('user:'.toLowerCase())) { userSearch = x.substring('user:'.length); }
else if (x.startsWith('u:'.toLowerCase())) { userSearch = x.substring('u:'.length); }
else if (x.startsWith('ip:'.toLowerCase())) { ipSearch = x.substring('ip:'.length); }
else if (x.startsWith('group:'.toLowerCase())) { groupSearch = x.substring('group:'.length); }
else if (x.startsWith('g:'.toLowerCase())) { groupSearch = x.substring('g:'.length); }
else if (x.startsWith('tag:'.toLowerCase())) { tagSearch = x.substring('tag:'.length); }
else if (x.startsWith('t:'.toLowerCase())) { tagSearch = x.substring('t:'.length); }
else if (x.startsWith('atag:'.toLowerCase())) { agentTagSearch = x.substring('atag:'.length); }
else if (x.startsWith('a:'.toLowerCase())) { agentTagSearch = x.substring('a:'.length); }
else if (x.startsWith('os:'.toLowerCase())) { osSearch = x.substring('os:'.length); }
else if (x.startsWith('amt:'.toLowerCase())) { amtSearch = x.substring('amt:'.length); }
else if (x.startsWith('desc:'.toLowerCase())) { descSearch = x.substring('desc:'.length); }
else if (x.startsWith('connectivity:'.toLowerCase())) { connectivitySearch = x.substring('connectivity:'.length); }
else if (x.startsWith('c:'.toLowerCase())) { connectivitySearch = x.substring('c:'.length); }
else if (x == 'wsc:ok') { wscSearch = 1; }
else if (x == 'wsc:noav') { wscSearch = 2; }
else if (x == 'wsc:noupdate') { wscSearch = 3; }