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

Merge pull request #1672 from pi-hole/fix/groups_backend

Browse Source 
Bugfix allowing to effectively set empty domain/client/adlist groupsets
This commit is contained in:
DL6ER
2021-01-13 21:28:20 +01:00
committed by GitHub
parent e3e1e456d1 ba1ac8621f
commit 012116a58d
1 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,7 +382,10 @@ if ($_POST['action'] == 'get_groups') {
throw new Exception('While executing DELETE statement: ' . $db->lastErrorMsg());
}
foreach ($_POST['groups'] as $gid) {
$groups = array();
if(isset($_POST['groups']))
$groups = $_POST['groups'];
foreach ($groups as $gid) {
$stmt = $db->prepare('INSERT INTO client_by_group (client_id,group_id) VALUES(:id,:gid);');
if (!$stmt) {
throw new Exception('While preparing INSERT INTO statement: ' . $db->lastErrorMsg());
@@ -400,7 +403,9 @@ if ($_POST['action'] == 'get_groups') {
throw new Exception('While executing INSERT INTO statement: ' . $db->lastErrorMsg());
}
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$reload = true;
JSON_success();
@@ -437,7 +442,9 @@ if ($_POST['action'] == 'get_groups') {
if (!$stmt->execute()) {
throw new Exception('While executing client statement: ' . $db->lastErrorMsg());
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$reload = true;
JSON_success();
@@ -677,7 +684,9 @@ if ($_POST['action'] == 'get_groups') {
$added++;
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$after = intval($db->querySingle("SELECT COUNT(*) FROM domainlist;"));
$difference = $after - $before;
@@ -739,39 +748,43 @@ if ($_POST['action'] == 'get_groups') {
throw new Exception('While executing: ' . $db->lastErrorMsg());
}
if (isset($_POST['groups'])) {
$stmt = $db->prepare('DELETE FROM domainlist_by_group WHERE domainlist_id = :id');
$stmt = $db->prepare('DELETE FROM domainlist_by_group WHERE domainlist_id = :id');
if (!$stmt) {
throw new Exception('While preparing DELETE statement: ' . $db->lastErrorMsg());
}
if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
throw new Exception('While binding id: ' . $db->lastErrorMsg());
}
if (!$stmt->execute()) {
throw new Exception('While executing DELETE statement: ' . $db->lastErrorMsg());
}
$groups = array();
if(isset($_POST['groups']))
$groups = $_POST['groups'];
foreach ($groups as $gid) {
$stmt = $db->prepare('INSERT INTO domainlist_by_group (domainlist_id,group_id) VALUES(:id,:gid);');
if (!$stmt) {
throw new Exception('While preparing DELETE statement: ' . $db->lastErrorMsg());
throw new Exception('While preparing INSERT INTO statement: ' . $db->lastErrorMsg());
}
if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
throw new Exception('While binding id: ' . $db->lastErrorMsg());
}
if (!$stmt->bindValue(':gid', intval($gid), SQLITE3_INTEGER)) {
throw new Exception('While binding gid: ' . $db->lastErrorMsg());
}
if (!$stmt->execute()) {
throw new Exception('While executing DELETE statement: ' . $db->lastErrorMsg());
throw new Exception('While executing INSERT INTO statement: ' . $db->lastErrorMsg());
}
}
foreach ($_POST['groups'] as $gid) {
$stmt = $db->prepare('INSERT INTO domainlist_by_group (domainlist_id,group_id) VALUES(:id,:gid);');
if (!$stmt) {
throw new Exception('While preparing INSERT INTO statement: ' . $db->lastErrorMsg());
}
if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
throw new Exception('While binding id: ' . $db->lastErrorMsg());
}
if (!$stmt->bindValue(':gid', intval($gid), SQLITE3_INTEGER)) {
throw new Exception('While binding gid: ' . $db->lastErrorMsg());
}
if (!$stmt->execute()) {
throw new Exception('While executing INSERT INTO statement: ' . $db->lastErrorMsg());
}
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$reload = true;
@@ -810,7 +823,9 @@ if ($_POST['action'] == 'get_groups') {
throw new Exception('While executing domainlist statement: ' . $db->lastErrorMsg());
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$reload = true;
JSON_success();
@@ -856,7 +871,9 @@ if ($_POST['action'] == 'get_groups') {
throw new Exception('While executing domainlist statement: ' . $db->lastErrorMsg());
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$reload = true;
JSON_success();
@@ -937,7 +954,9 @@ if ($_POST['action'] == 'get_groups') {
$added++;
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$reload = true;
JSON_success();
@@ -993,7 +1012,10 @@ if ($_POST['action'] == 'get_groups') {
throw new Exception('While executing DELETE statement: ' . $db->lastErrorMsg());
}
foreach ($_POST['groups'] as $gid) {
$groups = array();
if(isset($_POST['groups']))
$groups = $_POST['groups'];
foreach ($groups as $gid) {
$stmt = $db->prepare('INSERT INTO adlist_by_group (adlist_id,group_id) VALUES(:id,:gid);');
if (!$stmt) {
throw new Exception('While preparing INSERT INTO statement: ' . $db->lastErrorMsg());
@@ -1012,7 +1034,9 @@ if ($_POST['action'] == 'get_groups') {
}
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$reload = true;
JSON_success();
@@ -1050,7 +1074,9 @@ if ($_POST['action'] == 'get_groups') {
throw new Exception('While executing adlist statement: ' . $db->lastErrorMsg());
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$reload = true;
JSON_success();
@@ -1090,7 +1116,9 @@ if ($_POST['action'] == 'get_groups') {
$added++;
}
$db->query('COMMIT;');
if(!$db->query('COMMIT;')) {
throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg());
}
$after = intval($db->querySingle("SELECT COUNT(*) FROM domain_audit;"));
$difference = $after - $before;