Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-24 02:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow user to add in a comment next to domain entry

Browse Source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2019-10-14 21:55:29 +01:00
parent 34de877ccf
commit 07195fb4e7
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/pi-hole/php/add.php
View File

@@ -25,6 +25,7 @@ if(in_array($list, $check_lists)) {
// Split individual domains into array
$domains = preg_split('/\s+/', trim($_POST['domain']));
$comment = trim($_POST['comment']);
require_once("func.php");
require_once("database.php");
@@ -33,31 +34,31 @@ $db = SQLite3_connect($GRAVITYDB, SQLITE3_OPEN_READWRITE);
switch($list) {
case "white":
echo add_to_table($db, "whitelist", $domains);
echo add_to_table($db, "whitelist", $domains, $comment);
break;
case "black":
echo add_to_table($db, "blacklist", $domains);
echo add_to_table($db, "blacklist", $domains, $comment);
break;
case "black_regex":
echo add_to_table($db, "regex_blacklist", $domains);
echo add_to_table($db, "regex_blacklist", $domains, $comment);
break;
case "white_regex":
echo add_to_table($db, "regex_whitelist", $domains);
echo add_to_table($db, "regex_whitelist", $domains, $comment);
break;
case "black_wild":
echo add_to_table($db, "regex_blacklist", $domains, true);
echo add_to_table($db, "regex_blacklist", $domains, $comment, true);
break;
case "white_wild":
echo add_to_table($db, "regex_whitelist", $domains, true);
echo add_to_table($db, "regex_whitelist", $domains, $comment, true);
break;
case "audit":
echo add_to_table($db, "domain_audit", $domains);
echo add_to_table($db, "domain_audit", $domains, $comment);
break;
default:

5
scripts/pi-hole/php/database.php
View File

@@ -76,7 +76,7 @@ function SQLite3_connect($filename, $mode=SQLITE3_OPEN_READONLY)
* @param $returnnum boolean Whether to return an integer or a string
* @return string Success/error and number of processed domains
*/
function add_to_table($db, $table, $domains, $wildcardstyle=false, $returnnum=false)
function add_to_table($db, $table, $domains, $comment, $wildcardstyle=false, $returnnum=false)
{
// Begin transaction
if(!$db->exec("BEGIN TRANSACTION;"))
@@ -89,7 +89,7 @@ function add_to_table($db, $table, $domains, $wildcardstyle=false, $returnnum=fa
$initialcount = intval($db->querySingle("SELECT COUNT(*) FROM ".$table.";"));
// Prepare SQLite statememt
$stmt = $db->prepare("INSERT OR IGNORE INTO ".$table." (domain) VALUES (:domain);");
$stmt = $db->prepare("INSERT OR IGNORE INTO ".$table." (domain,comment) VALUES (:domain, :comment);");
// Return early if we failed to prepare the SQLite statement
if(!$stmt)
@@ -112,6 +112,7 @@ function add_to_table($db, $table, $domains, $wildcardstyle=false, $returnnum=fa
$domain = "(\\.|^)".str_replace(".","\\.",$domain)."$";
$stmt->bindValue(":domain", $domain, SQLITE3_TEXT);
$stmt->bindValue(":comment", $comment, SQLITE3_TEXT);
if($stmt->execute() && $stmt->reset())
$num++;