diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 51f8a09a..5abc2b3c 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -225,7 +225,7 @@ $("button[id^='adlist-btn-']").on("click", function (e) { $("input[name=\"adlist-del-"+id+"\"]").prop("checked", !status); // Untick and disable check box (or reset) $("input[name=\"adlist-enable-"+id+"\"]").prop("checked", status).prop("disabled", !status); - // Strink through text (or reset) + // Strike through text (or reset) $("a[id=\"adlist-text-"+id+"\"]").css("text-decoration", textType); // Highlight that the button has to be clicked in order to make the change live $("button[id=\"blockinglistsaveupdate\"]").addClass("btn-danger").css("font-weight", "bold"); diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php index ea6ae878..ffa32338 100644 --- a/scripts/pi-hole/php/savesettings.php +++ b/scripts/pi-hole/php/savesettings.php @@ -707,9 +707,10 @@ function readAdlists() if(strlen($_POST["newuserlists"]) > 1) { $domains = array_filter(preg_split('/\r\n|[\r\n]/', $_POST["newuserlists"])); + $comment = "'".$_POST["newusercomment"]."'"; foreach($domains as $domain) { - exec("sudo pihole -a adlist add ".escapeshellcmd($domain)); + exec("sudo pihole -a adlist add ".escapeshellcmd($domain)." ".escapeshellcmd($comment)); } } diff --git a/settings.php b/settings.php index e4d8ad3f..68fb130c 100644 --- a/settings.php +++ b/settings.php @@ -294,9 +294,16 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" -
- -
+
+
+ + +
+
+ + +
+