From 49282b2ee72fb9384eb057e81399aa60ebfa74b7 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 16 Jan 2025 19:15:51 +0100 Subject: [PATCH] #392 allow to display deleted entries --- lam/lib/treeview.inc | 4 ++-- lam/templates/lib/500_lam.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lam/lib/treeview.inc b/lam/lib/treeview.inc index e887c8dc1..27d907dea 100644 --- a/lam/lib/treeview.inc +++ b/lam/lib/treeview.inc @@ -36,7 +36,7 @@ use function LAM\SCHEMA\get_schema_objectclasses; /* This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2021 - 2024 Roland Gruber + Copyright (C) 2021 - 2025 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -489,7 +489,7 @@ class TreeView { $deleteButton = new htmlImage('../../graphics/delete.svg', $buttonSize, $buttonSize, _('Delete'), _('Delete')); $deleteButton->setOnClick('window.lam.treeview.deleteNode(\'' . getSecurityTokenName() . '\', ' - . '\'' . getSecurityTokenValue() . '\', \'' . base64_encode($dn) . '\', \'' . htmlspecialchars(extractRDN($dn)) . '\', ' + . '\'' . getSecurityTokenValue() . '\', \'' . base64_encode($dn) . '\', \'' . base64_encode(htmlspecialchars(extractRDN($dn))) . '\', ' . '\'' . _('Delete') . '\', \'' . _('Cancel') . '\', \'' . _('Delete this entry') . '\', \'' . _('Ok') . '\', ' . '\'' . _('Error') . '\');'); $deleteButton->setCSSClasses($buttonClasses); diff --git a/lam/templates/lib/500_lam.js b/lam/templates/lib/500_lam.js index 35c83225e..d8d640c60 100644 --- a/lam/templates/lib/500_lam.js +++ b/lam/templates/lib/500_lam.js @@ -1,7 +1,7 @@ /** This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2003 - 2024 Roland Gruber + Copyright (C) 2003 - 2025 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2475,7 +2475,7 @@ window.lam.treeview.createNodeEnterAttributesStep = function (event, tokenName, */ window.lam.treeview.deleteNode = function (tokenName, tokenValue, dn, text, okText, cancelText, title, errorOkText, errorTitle) { const textSpan = document.querySelector('.treeview-delete-entry'); - textSpan.innerText = text; + textSpan.innerText = window.atob(text); const dialogContent = document.getElementById('treeview_delete_dlg').cloneNode(true); dialogContent.classList.remove('hidden'); Swal.fire({