pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove special handling for audited domains and just add them separately to both lists.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-08-07 22:20:00 +02:00
parent 586224fde2
commit 965f2083a6
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/js/auditlog.js
+3 -1
View File
@@ -78,7 +78,7 @@ function add(domain,list) {
$.ajax({
url: "scripts/pi-hole/php/add.php",
method: "post",
data: {"domain":domain, "list":list, "token":token, "auditlog":1}
data: {"domain":domain, "list":list, "token":token}
});
}
@@ -91,6 +91,7 @@ $(document).ready(function() {
var url = ($(this).parents("tr"))[0].innerText.split(" ")[0];
if($(this).context.innerText === " Blacklist")
{
add(url,"audit");
add(url,"black");
$("#gravityBtn").prop("disabled", false);
}
@@ -104,6 +105,7 @@ $(document).ready(function() {
var url = ($(this).parents("tr"))[0].innerText.split(" ")[0].split(" ")[0];
if($(this).context.innerText === " Whitelist")
{
add(url,"audit");
add(url,"white");
$("#gravityBtn").prop("disabled", false);
}
scripts/pi-hole/php/add.php
-4
View File
@@ -33,14 +33,10 @@ $db = SQLite3_connect($GRAVITYDB, SQLITE3_OPEN_READWRITE);
switch($list) {
case "white":
if(isset($_POST["auditlog"]))
echo add_to_table($db, "domain_audit", $domains);
echo add_to_table($db, "whitelist", $domains);
break;
case "black":
if(isset($_POST["auditlog"]))
echo add_to_table($db, "domain_audit", $domains);
echo add_to_table($db, "blacklist", $domains);
break;
scripts/pi-hole/php/database.php
+6 -6
View File
@@ -82,7 +82,7 @@ function add_to_table($db, $table, $domains, $wildcardstyle=false, $returnnum=fa
if($returnnum)
return 0;
else
return "Error, added: 0\n";
return "Error, added: 0";
}
// Loop over domains and inject the lines into the database
@@ -102,7 +102,7 @@ function add_to_table($db, $table, $domains, $wildcardstyle=false, $returnnum=fa
if($returnnum)
return $num;
else
return "Error, added: ".$num."\n";
return "Error, added: ".$num;
}
}
@@ -111,7 +111,7 @@ function add_to_table($db, $table, $domains, $wildcardstyle=false, $returnnum=fa
if($returnnum)
return $num;
else
return "Success, added: ".$num."\n";
return "Success, added: ".$num;
}
/**
@@ -135,7 +135,7 @@ function remove_from_table($db, $table, $domains, $returnnum=false)
if($returnnum)
return 0;
else
return "Error, added: 0\n";
return "Error, added: 0";
}
// Loop over domains and remove the lines from the database
@@ -152,7 +152,7 @@ function remove_from_table($db, $table, $domains, $returnnum=false)
if($returnnum)
return $num;
else
return "Error, removed: ".$num."\n";
return "Error, removed: ".$num;
}
}
@@ -161,7 +161,7 @@ function remove_from_table($db, $table, $domains, $returnnum=false)
if($returnnum)
return $num;
else
return "Success, removed: ".$num."\n";
return "Success, removed: ".$num;
}
?>