Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 12:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1029 from pi-hole/tweak/AddCommentEntryToBlocklistPage

Browse Source 
Add ability for user to include comment when adding a blocklist
This commit is contained in:
Adam Warner
2019-11-14 15:46:10 +00:00
committed by GitHub
parent 64e80b685f 8311a0aefc
commit acf448f592
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/pi-hole/js/settings.js
View File

@@ -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");

3
scripts/pi-hole/php/savesettings.php
View File

@@ -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));
}
}

13
settings.php
View File

@@ -294,9 +294,16 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
</tbody>
</table>
</div>
<div class="form-group">
<input name="newuserlists" class="form-control" placeholder="Enter a URL to add a new blocklist">
</div>
<div class="form-group row">
<div class="col-xs-6">
<label for="newuserlists">Domain:</label>
<input name="newuserlists" type="text" class="form-control" placeholder="Enter a URL to add a new blocklist">
</div>
<div class="col-xs-6">
<label for="newusercomment">Comment:</label>
<input name="newusercomment" type="text" class="form-control" placeholder="Include a comment (optional)">
</div>
</div>
<input type="hidden" name="field" value="adlists">
<input type="hidden" name="token" value="<?php echo $token ?>">
</div>