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

Improve warnings on the domain management pages.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-06-02 11:37:23 +02:00
parent 814eca9a0f
commit 332cff1d36
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/pi-hole/php/groups.php
View File

@@ -449,6 +449,7 @@ if ($_POST['action'] == 'get_groups') {
// Add new domain
try {
$domains = explode(' ', trim($_POST['domain']));
$before = intval($db->querySingle("SELECT COUNT(*) FROM domainlist;"));
$total = count($domains);
$added = 0;
$stmt = $db->prepare('REPLACE INTO domainlist (domain,type,comment) VALUES (:domain,:type,:comment)');
@@ -525,8 +526,23 @@ if ($_POST['action'] == 'get_groups') {
$added++;
}
$after = intval($db->querySingle("SELECT COUNT(*) FROM domainlist;"));
$difference = $after - $before;
if($total === 1) {
if($difference !== 1) {
$msg = "Not adding ". htmlentities(utf8_encode($domain)) . " as it is already on the list";
} else {
$msg = "Added " . htmlentities(utf8_encode($domain));
}
} else {
if($difference !== $total) {
$msg = "Added " . ($after-$before) . " out of ". $total . " domains (skipped duplicates)";
} else {
$msg = "Added " . $total . " domains";
}
}
$reload = true;
JSON_success();
JSON_success($msg);
} catch (\Exception $ex) {
JSON_error($ex->getMessage());
}
@@ -865,5 +881,4 @@ if ($_POST['action'] == 'get_groups') {
// Reload lists in pihole-FTL after having added something
if ($reload) {
$output = pihole_execute('restartdns reload-lists');
echo implode("\n", $output);
}