Merge branch 'development-v6' into tweak/contentType

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-11-20 19:51:49 +01:00
4 changed files with 34 additions and 2 deletions

26
error403.lp Normal file
View File

@@ -0,0 +1,26 @@
<? --[[
* Pi-hole: A black hole for Internet advertisements
* (c) 2023 Pi-hole, LLC (https://pi-hole.net)
* Network-wide ad blocking via your own hardware.
*
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license.
--]]
mg.include('scripts/pi-hole/lua/header.lp','r')
?>
<body class="hold-transition layout-boxed login-page">
<div class="box login-box">
<section style="padding: 15px;">
<h2 class="error-headline text-danger">403</h2>
<div class="error-content">
<h3><i class="fa fa-times-circle text-danger"></i> Oops! Access denied.</h3>
<p>
You don't have permission to access <code><?=mg.request_info.request_uri?></code> on this server.<br>
Did you mean to go to <a href="<?=pihole.webhome()?>">your Pi-hole's dashboard</a> instead?
</p>
</div>
</section>
</div>
</body>
</html>

View File

@@ -151,7 +151,8 @@ function initTable() {
'" title="' + '" title="' +
tooltip + tooltip +
'" class="breakall">' + '" class="breakall">' +
utils.escapeHtml(data.domain) + utils.escapeHtml(data.unicode) +
(data.domain !== data.unicode ? " (" + utils.escapeHtml(data.domain) + ")" : "") +
"</code>" "</code>"
); );

View File

@@ -191,7 +191,7 @@ $(function () {
function deleteThisSession() { function deleteThisSession() {
// This function is called when a red trash button is clicked // This function is called when a red trash button is clicked
// We get the ID of the current item from the data-del-id attribute // We get the ID of the current item from the data-del-id attribute
const thisID = parseInt(this.attr("data-del-id"), 10); const thisID = parseInt($(this).attr("data-del-id"), 10);
deleted = 0; deleted = 0;
deleteOneSession(thisID, 1, false); deleteOneSession(thisID, 1, false);
} }

View File

@@ -483,6 +483,11 @@ kbd {
color: #808890; color: #808890;
} }
/* Used in error403 */
.text-danger {
color: #f54;
}
.warning-count { .warning-count {
color: #000; color: #000;
background: #f94; background: #f94;