Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show debug logs in colors #2142

Merged
merged 2 commits into from
Mar 12, 2022
Merged

Show debug logs in colors #2142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea24655
Add colors to debug log
rdwebdesign Mar 11, 2022
01eef9c
Fix prettier
rdwebdesign Mar 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 34 additions & 13 deletions scripts/pi-hole/php/debug.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
require "password.php";
require "auth.php";

if(!$auth) {
if (!$auth) {
die("Unauthorized");
}

Expand All @@ -18,22 +18,43 @@
check_csrf($token);

function echoEvent($datatext) {
$data = htmlspecialchars($datatext);
$ANSIcolors = array(
chr(27)."[1;91m" => '<span class="log-red">',
chr(27)."[1;32m" => '<span class="log-green">',
chr(27)."[1;33m" => '<span class="log-yellow">',
chr(27)."[1;34m" => '<span class="log-blue">',
chr(27)."[1;35m" => '<span class="log-purple">',
chr(27)."[1;36m" => '<span class="log-cyan">',

if(!isset($_GET["IE"]))
echo "data: ".implode("\ndata: ", explode("\n", $data))."\n\n";
else
echo $data;
}
chr(27)."[90m" => '<span class="log-gray">',
chr(27)."[91m" => '<span class="log-red">',
chr(27)."[32m" => '<span class="log-green">',
chr(27)."[33m" => '<span class="log-yellow">',
chr(27)."[94m" => '<span class="log-blue">',
chr(27)."[95m" => '<span class="log-purple">',
chr(27)."[96m" => '<span class="log-cyan">',

chr(27)."[1m" => '<span class="text-bold">',
chr(27)."[4m" => '<span class="text-underline">',

chr(27)."[0m" => '</span>',
);

if(isset($_GET["upload"]))
{
$proc = popen("sudo pihole -d -a -w", "r");
$data = str_replace(array_keys($ANSIcolors), $ANSIcolors, htmlspecialchars($datatext));

if (!isset($_GET["IE"])) {
echo "data: ".implode("\ndata: ", explode("\n", $data))."\n\n";
} else {
echo $data;
}
}
else
{
$proc = popen("sudo pihole -d -w", "r");

if (isset($_GET["upload"])) {
$proc = popen("sudo pihole -d -a -w", "r");
} else {
$proc = popen("sudo pihole -d -w", "r");
}

while (!feof($proc)) {
echoEvent(fread($proc, 4096));
}
Expand Down
6 changes: 6 additions & 0 deletions style/pi-hole.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,3 +756,9 @@ table.dataTable tbody > tr > .selected {
word-break: break-word;
white-space: pre-wrap;
}

#output {
margin: 5px 0;
min-height: 36px;
padding: 4px 8px;
}
28 changes: 28 additions & 0 deletions style/themes/default-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,34 @@ td.highlight {
border: 1px solid #353c42;
}

/* Used in debug log page */
.log-red {
color: #ff4038;
}
.log-green {
color: #4c4;
}
.log-yellow {
color: #fb0;
}
.log-blue {
color: #48f;
}
.log-purple {
color: #b8e;
}
.log-cyan {
color: #0df;
}
.log-gray {
color: #999;
}

#output {
border-color: #505458;
background: #272c30;
}

/* Used by the long-term pages */
.daterangepicker {
background-color: #3e464c;
Expand Down
25 changes: 23 additions & 2 deletions style/themes/default-darker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,6 @@ fieldset[disabled] .btn-link:hover {
background-color: rgb(39, 42, 44);
}
.dropdown-menu > li > a {
color: rgb(200, 195, 188);
color: rgb(157, 148, 136);
}
.dropdown-menu > li > a:focus,
Expand Down Expand Up @@ -5060,7 +5059,6 @@ fieldset[disabled] .btn-yahoo.focus {
color: rgb(76, 188, 255) !important;
}
.text-black {
color: rgb(221, 218, 214) !important;
color: rgb(232, 230, 227) !important;
}
.text-light-blue {
Expand Down Expand Up @@ -5963,3 +5961,26 @@ td.highlight {
border-color: #d8b013 !important;
color: #f3e8c8 !important;
}

/* Used in debug log page */
.log-red {
color: #e22;
}
.log-green {
color: #0b0;
}
.log-yellow {
color: #fb0;
}
.log-blue {
color: #08c;
}
.log-purple {
color: #c6f;
}
.log-cyan {
color: #0df;
}
.log-gray {
color: #999;
}
25 changes: 24 additions & 1 deletion style/themes/default-light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
}
.main-header .navbar .sidebar-toggle:hover {
color: #f6f6f6;
background-color: rgba(0, 0, 0, 0.1);
background-color: #367fa9;
}
@media (max-width: 767px) {
Expand Down Expand Up @@ -213,6 +212,30 @@
color: #36f !important;
}

/* Used in debug log page */
.log-red {
color: #e00;
}
.log-green {
color: #093;
}
.log-yellow {
color: #e90;
font-weight: bold;
}
.log-blue {
color: #04d;
}
.log-purple {
color: #a0c;
}
.log-cyan {
color: #0ab;
}
.log-gray {
color: #999;
}

td.highlight {
background-color: rgba(255, 204, 0, 0.333);
}
Expand Down
25 changes: 25 additions & 0 deletions style/themes/lcars.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ pre {
#output {
padding: 10px 3px;
border-radius: 12px;
background: #181818;
color: #9ab;
}

td code {
Expand Down Expand Up @@ -1888,6 +1890,29 @@ input[type="password"]::-webkit-caps-lock-indicator {
color: #36f !important;
}

/* Used in debug log page */
.log-red {
color: #e22;
}
.log-green {
color: #0b0;
}
.log-yellow {
color: #fb0;
}
.log-blue {
color: #08c;
}
.log-purple {
color: #c6f;
}
.log-cyan {
color: #0df;
}
.log-gray {
color: #999;
}

div.dataTables_wrapper div.dataTables_paginate ul.pagination {
margin: 10px 0;
text-transform: uppercase;
Expand Down