'
@@ -1607,6 +1670,7 @@
html += renderLogOverview();
container.innerHTML = html;
+ restoreFocusState(focusState);
const extIpEl = document.getElementById('external-ip');
if (extIpEl) {
@@ -2188,21 +2252,72 @@
}
// Render banned IPs with "Unban" button
+ function slugifyId(value, prefix) {
+ var input = (value || '').toString();
+ var base = input.toLowerCase().replace(/[^a-z0-9]+/g, '-');
+ var hash = 0;
+ for (var i = 0; i < input.length; i++) {
+ hash = ((hash << 5) - hash) + input.charCodeAt(i);
+ hash |= 0;
+ }
+ hash = Math.abs(hash);
+ base = base.replace(/^-+|-+$/g, '');
+ if (!base) {
+ base = 'item';
+ }
+ return (prefix || 'id') + '-' + base + '-' + hash;
+ }
+
function renderBannedIPs(jailName, ips) {
if (!ips || ips.length === 0) {
return '
';
}
+ var listId = slugifyId(jailName || 'jail', 'banned-list');
+ var hiddenId = listId + '-hidden';
+ var toggleId = listId + '-toggle';
+ var maxVisible = 5;
+ var visible = ips.slice(0, maxVisible);
+ var hidden = ips.slice(maxVisible);
var content = '
';
- ips.forEach(function(ip) {
- content += ''
- + '
'
- + '
' + ip + ''
+
+ function bannedIpRow(ip) {
+ var safeIp = escapeHtml(ip);
+ var encodedIp = encodeURIComponent(ip);
+ return ''
+ + '
'
+ + ' ' + safeIp + ''
+ ' '
+ '
';
+ }
+
+ visible.forEach(function(ip) {
+ content += bannedIpRow(ip);
});
+
+ if (hidden.length) {
+ content += '
';
+ hidden.forEach(function(ip) {
+ content += bannedIpRow(ip);
+ });
+ content += '
';
+
+ var moreLabel = t('dashboard.banned.show_more', 'Show more') + ' +' + hidden.length;
+ var lessLabel = t('dashboard.banned.show_less', 'Hide extra');
+ content += ''
+ + '
';
+ }
+
content += '
';
return content;
}
@@ -2210,37 +2325,70 @@
// Filter IPs on dashboard table
function filterIPs() {
const input = document.getElementById("ipSearch");
+ if (!input) {
+ return;
+ }
const query = input.value.trim();
+ const rows = document.querySelectorAll("#jailsTable .jail-row");
- // Process each row in the jails table
- document.querySelectorAll("#jailsTable .jail-row").forEach(row => {
- const ipItems = row.querySelectorAll("div.flex");
+ rows.forEach(row => {
+ const hiddenSections = row.querySelectorAll(".banned-ip-hidden");
+ const toggleButtons = row.querySelectorAll(".banned-ip-toggle");
+
+ if (query === "") {
+ hiddenSections.forEach(section => {
+ if (section.getAttribute("data-initially-hidden") === "true") {
+ section.classList.add("hidden");
+ }
+ });
+ toggleButtons.forEach(button => {
+ const moreLabel = button.getAttribute("data-more-label");
+ if (moreLabel) {
+ button.textContent = moreLabel;
+ }
+ button.setAttribute("data-expanded", "false");
+ });
+ } else {
+ hiddenSections.forEach(section => section.classList.remove("hidden"));
+ toggleButtons.forEach(button => {
+ const lessLabel = button.getAttribute("data-less-label");
+ if (lessLabel) {
+ button.textContent = lessLabel;
+ }
+ button.setAttribute("data-expanded", "true");
+ });
+ }
+
+ const ipItems = row.querySelectorAll(".banned-ip-item");
let rowHasMatch = false;
- ipItems.forEach(li => {
- const span = li.querySelector("span.text-sm");
+ ipItems.forEach(item => {
+ const span = item.querySelector("span.text-sm");
if (!span) return;
- // stash original if needed
- let originalIP = span.getAttribute("data-original");
- if (!originalIP) {
- originalIP = span.textContent.trim();
- span.setAttribute("data-original", originalIP);
- }
+ const storedValue = span.getAttribute("data-ip-value");
+ const originalIP = storedValue ? decodeURIComponent(storedValue) : span.textContent.trim();
if (query === "") {
// When the search query is empty, show all IP items and reset their inner HTML.
- li.style.display = "";
- span.innerHTML = originalIP;
+ item.style.display = "";
+ span.textContent = originalIP;
rowHasMatch = true;
- } else if (originalIP.includes(query)) {
+ } else if (originalIP.indexOf(query) !== -1) {
// If the IP contains the query, show the item and highlight the matching text.
- li.style.display = "";
- const regex = new RegExp(query, "gi");
- span.innerHTML = originalIP.replace(regex, m => `
${m}`);
+ item.style.display = "";
+ const escapedPattern = query.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+ const regex = new RegExp(escapedPattern, "gi");
+ var highlighted = originalIP.replace(regex, function(match) {
+ return "%%MARK_START%%" + match + "%%MARK_END%%";
+ });
+ var safeHighlighted = escapeHtml(highlighted)
+ .replace(/%%MARK_START%%/g, "
")
+ .replace(/%%MARK_END%%/g, "");
+ span.innerHTML = safeHighlighted;
rowHasMatch = true;
} else {
- li.style.display = "none";
+ item.style.display = "none";
}
});
@@ -2249,6 +2397,24 @@
});
}
+ function toggleBannedList(hiddenId, buttonId) {
+ var hidden = document.getElementById(hiddenId);
+ var button = document.getElementById(buttonId);
+ if (!hidden || !button) {
+ return;
+ }
+ var isHidden = hidden.classList.contains("hidden");
+ if (isHidden) {
+ hidden.classList.remove("hidden");
+ button.textContent = button.getAttribute("data-less-label") || button.textContent;
+ button.setAttribute("data-expanded", "true");
+ } else {
+ hidden.classList.add("hidden");
+ button.textContent = button.getAttribute("data-more-label") || button.textContent;
+ button.setAttribute("data-expanded", "false");
+ }
+ }
+
//*******************************************************************
//* Functions to manage IP-bans : *
//*******************************************************************