Merge branch 'devel' into tweak/customDNS_page

scripts/pi-hole/php/add.php

@@ -34,10 +34,12 @@ $db = SQLite3_connect($GRAVITYDB, SQLITE3_OPEN_READWRITE);
 
 switch($list) {
 	case "white":
+		$domains = array_map('strtolower', $domains);
 		echo add_to_table($db, "domainlist", $domains, $comment, false, false, ListType::whitelist);
 		break;
 
 	case "black":
+		$domains = array_map('strtolower', $domains);
 		echo add_to_table($db, "domainlist", $domains, $comment, false, false, ListType::blacklist);
 		break;
 

scripts/pi-hole/php/database.php

@@ -20,6 +20,20 @@ function getGravityDBFilename()
 	}
 }
 
+function getQueriesDBFilename()
+{
+	// Get possible non-standard location of FTL's database
+	$FTLsettings = parse_ini_file("/etc/pihole/pihole-FTL.conf");
+	if(isset($FTLsettings["DBFILE"]))
+	{
+		return $FTLsettings["DBFILE"];
+	}
+	else
+	{
+		return "/etc/pihole/pihole-FTL.db";
+	}
+}
+
 function SQLite3_connect_try($filename, $mode, $trytoreconnect)
 {
 	try

scripts/pi-hole/php/groups.php

@@ -0,0 +1,676 @@
+<?php
+/* Pi-hole: A black hole for Internet advertisements
+*  (c) 2019 Pi-hole, LLC (https://pi-hole.net)
+*  Network-wide ad blocking via your own hardware.
+*
+*  This file is copyright under the latest version of the EUPL.
+*  Please see LICENSE file for your rights under this license. */
+
+require_once('auth.php');
+
+// Authentication checks
+if (isset($_POST['token'])) {
+    check_cors();
+    check_csrf($_POST['token']);
+} else {
+    log_and_die('Not allowed (login session invalid or expired, please relogin on the Pi-hole dashboard)!');
+}
+
+$reload = false;
+
+require_once('func.php');
+require_once('database.php');
+$GRAVITYDB = getGravityDBFilename();
+$db = SQLite3_connect($GRAVITYDB, SQLITE3_OPEN_READWRITE);
+
+function JSON_success($message = null)
+{
+    header('Content-type: application/json');
+    echo json_encode(array('success' => true, 'message' => $message));
+}
+
+function JSON_error($message = null)
+{
+    header('Content-type: application/json');
+    $response = array('success' => false, 'message' => $message);
+    if (isset($_POST['action'])) {
+        array_push($response, array('action' => $_POST['action']));
+    }
+    echo json_encode($response);
+}
+
+if ($_POST['action'] == 'get_groups') {
+    // List all available groups
+    try {
+        $query = $db->query('SELECT * FROM "group";');
+        $data = array();
+        while (($res = $query->fetchArray(SQLITE3_ASSOC)) !== false) {
+            array_push($data, $res);
+        }
+        echo json_encode(array('data' => $data));
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'add_group') {
+    // Add new group
+    try {
+        $stmt = $db->prepare('INSERT INTO "group" (name,description) VALUES (:name,:desc)');
+        if (!$stmt) {
+            throw new Exception('While preparing statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':name', $_POST['name'], SQLITE3_TEXT)) {
+            throw new Exception('While binding name: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':desc', $_POST['desc'], SQLITE3_TEXT)) {
+            throw new Exception('While binding desc: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing: ' . $db->lastErrorMsg());
+        }
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'edit_group') {
+    // Edit group identified by ID
+    try {
+        $stmt = $db->prepare('UPDATE "group" SET enabled=:enabled, name=:name, description=:desc WHERE id = :id');
+        if (!$stmt) {
+            throw new Exception('While preparing statement: ' . $db->lastErrorMsg());
+        }
+
+        $status = ((int) $_POST['status']) !== 0 ? 1 : 0;
+        if (!$stmt->bindValue(':enabled', $status, SQLITE3_INTEGER)) {
+            throw new Exception('While binding enabled: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':name', $_POST['name'], SQLITE3_TEXT)) {
+            throw new Exception('While binding name: ' . $db->lastErrorMsg());
+        }
+
+        $desc = $_POST['desc'];
+        if (strlen($desc) == 0) {
+            // Store NULL in database for empty descriptions
+            $desc = null;
+        }
+        if (!$stmt->bindValue(':desc', $desc, SQLITE3_TEXT)) {
+            throw new Exception('While binding desc: ' . $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: ' . $db->lastErrorMsg());
+        }
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'delete_group') {
+    // Delete group identified by ID
+    try {
+        $table_name = ['domainlist_by_group', 'client_by_group', 'adlist_by_group', 'group'];
+        $table_keys = ['group_id', 'group_id', 'group_id', 'id'];
+        for ($i = 0; $i < count($table_name); $i++) {
+            $table = $table_name[$i];
+            $key = $table_keys[$i];
+
+            $stmt = $db->prepare("DELETE FROM \"$table\" WHERE $key = :id;");
+            if (!$stmt) {
+                throw new Exception("While preparing DELETE FROM $table statement: " . $db->lastErrorMsg());
+            }
+
+            if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
+                throw new Exception("While binding id to DELETE FROM $table statement: " . $db->lastErrorMsg());
+            }
+
+            if (!$stmt->execute()) {
+                throw new Exception("While executing DELETE FROM $table statement: " . $db->lastErrorMsg());
+            }
+
+            if (!$stmt->reset()) {
+                throw new Exception("While resetting DELETE FROM $table statement: " . $db->lastErrorMsg());
+            }
+        }
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'get_clients') {
+    // List all available groups
+    try {
+        $QUERYDB = getQueriesDBFilename();
+        $FTLdb = SQLite3_connect($QUERYDB);
+
+        $query = $db->query('SELECT * FROM client;');
+        if (!$query) {
+            throw new Exception('Error while querying gravity\'s client table: ' . $db->lastErrorMsg());
+        }
+
+
+        $data = array();
+        while (($res = $query->fetchArray(SQLITE3_ASSOC)) !== false) {
+            $group_query = $db->query('SELECT group_id FROM client_by_group WHERE client_id = ' . $res['id'] . ';');
+            if (!$group_query) {
+                throw new Exception('Error while querying gravity\'s client_by_group table: ' . $db->lastErrorMsg());
+            }
+
+            $stmt = $FTLdb->prepare('SELECT name FROM network WHERE id = (SELECT network_id FROM network_addresses WHERE ip = :ip);');
+            if (!$stmt) {
+                throw new Exception('Error while preparing network table statement: ' . $db->lastErrorMsg());
+            }
+
+            if (!$stmt->bindValue(':ip', $res['ip'], SQLITE3_TEXT)) {
+                throw new Exception('While binding to network table statement: ' . $db->lastErrorMsg());
+            }
+
+            $result = $stmt->execute();
+            if (!$result) {
+                throw new Exception('While executing network table statement: ' . $db->lastErrorMsg());
+            }
+
+            // There will always be a result. Unknown host names are NULL
+            $name_result = $result->fetchArray(SQLITE3_ASSOC);
+            $res['name'] = $name_result['name'];
+    
+            $groups = array();
+            while ($gres = $group_query->fetchArray(SQLITE3_ASSOC)) {
+                array_push($groups, $gres['group_id']);
+            }
+            $res['groups'] = $groups;
+            array_push($data, $res);
+        }
+
+        echo json_encode(array('data' => $data));
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'get_unconfigured_clients') {
+    // List all available clients WITHOUT already configured clients
+    try {
+        $QUERYDB = getQueriesDBFilename();
+        $FTLdb = SQLite3_connect($QUERYDB);
+
+        $query = $FTLdb->query('SELECT DISTINCT ip,network.name FROM network_addresses AS name LEFT JOIN network ON network.id = network_id ORDER BY ip ASC;');
+        if (!$query) {
+            throw new Exception('Error while querying FTL\'s database: ' . $db->lastErrorMsg());
+        }
+
+        // Loop over results
+        $ips = array();
+        while ($res = $query->fetchArray(SQLITE3_ASSOC)) {
+            $ips[$res['ip']] = $res['name'];
+        }
+        $FTLdb->close();
+
+        $query = $db->query('SELECT ip FROM client;');
+        if (!$query) {
+            throw new Exception('Error while querying gravity\'s database: ' . $db->lastErrorMsg());
+        }
+
+        // Loop over results, remove already configured clients
+        while (($res = $query->fetchArray(SQLITE3_ASSOC)) !== false) {
+            if (isset($ips[$res['ip']])) {
+                unset($ips[$res['ip']]);
+            }
+        }
+
+        echo json_encode($ips);
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'add_client') {
+    // Add new client
+    try {
+        $stmt = $db->prepare('INSERT INTO client (ip) VALUES (:ip)');
+        if (!$stmt) {
+            throw new Exception('While preparing statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':ip', $_POST['ip'], SQLITE3_TEXT)) {
+            throw new Exception('While binding ip: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing: ' . $db->lastErrorMsg());
+        }
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'edit_client') {
+    // Edit client identified by ID
+    try {
+        $stmt = $db->prepare('DELETE FROM client_by_group WHERE client_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());
+        }
+        
+        $db->query('BEGIN TRANSACTION;');
+        foreach ($_POST['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());
+            }
+    
+            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;');
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'delete_client') {
+    // Delete client identified by ID
+    try {
+        $stmt = $db->prepare('DELETE FROM client_by_group WHERE client_id=:id');
+        if (!$stmt) {
+            throw new Exception('While preparing client_by_group statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
+            throw new Exception('While binding id to client_by_group statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing client_by_group statement: ' . $db->lastErrorMsg());
+        }
+
+        $stmt = $db->prepare('DELETE FROM client WHERE id=:id');
+        if (!$stmt) {
+            throw new Exception('While preparing client statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
+            throw new Exception('While binding id to client statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing client statement: ' . $db->lastErrorMsg());
+        }
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'get_domains') {
+    // List all available groups
+    try {
+        $query = $db->query('SELECT * FROM domainlist;');
+        if (!$query) {
+            throw new Exception('Error while querying gravity\'s domainlist table: ' . $db->lastErrorMsg());
+        }
+
+        $data = array();
+        while (($res = $query->fetchArray(SQLITE3_ASSOC)) !== false) {
+            $group_query = $db->query('SELECT group_id FROM domainlist_by_group WHERE domainlist_id = ' . $res['id'] . ';');
+            if (!$group_query) {
+                throw new Exception('Error while querying gravity\'s domainlist_by_group table: ' . $db->lastErrorMsg());
+            }
+    
+            $groups = array();
+            while ($gres = $group_query->fetchArray(SQLITE3_ASSOC)) {
+                array_push($groups, $gres['group_id']);
+            }
+            $res['groups'] = $groups;
+            array_push($data, $res);
+        }
+
+
+        echo json_encode(array('data' => $data));
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'add_domain') {
+    // Add new domain
+    try {
+        $stmt = $db->prepare('INSERT INTO domainlist (domain,type,comment) VALUES (:domain,:type,:comment)');
+        if (!$stmt) {
+            throw new Exception('While preparing statement: ' . $db->lastErrorMsg());
+        }
+
+        $type = intval($_POST['type']);
+
+        $domain = $_POST['domain'];
+        if($type === ListType::whitelist || $type === ListType::blacklist)
+        {
+            // If adding to the exact lists, we convert the domain lower case and check whether it is valid
+            $domain = strtolower($domain);
+            if(filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) === false)
+            {
+                throw new Exception('Domain ' . htmlentities(utf8_encode($domain)) . 'is not a valid domain.');
+            }
+        }
+
+        if (!$stmt->bindValue(':domain', $domain, SQLITE3_TEXT)) {
+            throw new Exception('While binding domain: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':type', $type, SQLITE3_TEXT)) {
+            throw new Exception('While binding type: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':comment', $_POST['comment'], SQLITE3_TEXT)) {
+            throw new Exception('While binding comment: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing: ' . $db->lastErrorMsg());
+        }
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'edit_domain') {
+    // Edit domain identified by ID
+    try {
+        $stmt = $db->prepare('UPDATE domainlist SET enabled=:enabled, comment=:comment, type=:type WHERE id = :id');
+        if (!$stmt) {
+            throw new Exception('While preparing statement: ' . $db->lastErrorMsg());
+        }
+
+        $status = intval($_POST['status']);
+        if ($status !== 0) {
+                $status = 1;
+        }
+
+        if (!$stmt->bindValue(':enabled', $status, SQLITE3_INTEGER)) {
+            throw new Exception('While binding enabled: ' . $db->lastErrorMsg());
+        }
+
+        $comment = $_POST['comment'];
+        if (strlen($comment) == 0) {
+                // Store NULL in database for empty comments
+                $comment = null;
+        }
+        if (!$stmt->bindValue(':comment', $comment, SQLITE3_TEXT)) {
+            throw new Exception('While binding comment: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':type', intval($_POST['type']), SQLITE3_INTEGER)) {
+            throw new Exception('While binding type: ' . $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: ' . $db->lastErrorMsg());
+        }
+
+        $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());
+        }
+        
+        $db->query('BEGIN TRANSACTION;');
+        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;');
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'delete_domain') {
+    // Delete domain identified by ID
+    try {
+        $stmt = $db->prepare('DELETE FROM domainlist_by_group WHERE domainlist_id=:id');
+        if (!$stmt) {
+            throw new Exception('While preparing domainlist_by_group statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
+            throw new Exception('While binding id to domainlist_by_group statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing domainlist_by_group statement: ' . $db->lastErrorMsg());
+        }
+
+        $stmt = $db->prepare('DELETE FROM domainlist WHERE id=:id');
+        if (!$stmt) {
+            throw new Exception('While preparing domainlist statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
+            throw new Exception('While binding id to domainlist statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing domainlist statement: ' . $db->lastErrorMsg());
+        }
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'get_adlists') {
+    // List all available groups
+    try {
+        $query = $db->query('SELECT * FROM adlist;');
+        if (!$query) {
+            throw new Exception('Error while querying gravity\'s adlist table: ' . $db->lastErrorMsg());
+        }
+
+        $data = array();
+        while (($res = $query->fetchArray(SQLITE3_ASSOC)) !== false) {
+            $group_query = $db->query('SELECT group_id FROM adlist_by_group WHERE adlist_id = ' . $res['id'] . ';');
+            if (!$group_query) {
+                throw new Exception('Error while querying gravity\'s adlist_by_group table: ' . $db->lastErrorMsg());
+            }
+    
+            $groups = array();
+            while ($gres = $group_query->fetchArray(SQLITE3_ASSOC)) {
+                array_push($groups, $gres['group_id']);
+            }
+            $res['groups'] = $groups;
+            array_push($data, $res);
+        }
+
+
+        echo json_encode(array('data' => $data));
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'add_adlist') {
+    // Add new adlist
+    try {
+        $stmt = $db->prepare('INSERT INTO adlist (address,comment) VALUES (:address,:comment)');
+        if (!$stmt) {
+            throw new Exception('While preparing statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':address', $_POST['address'], SQLITE3_TEXT)) {
+            throw new Exception('While binding address: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':comment', $_POST['comment'], SQLITE3_TEXT)) {
+            throw new Exception('While binding comment: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing: ' . $db->lastErrorMsg());
+        }
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'edit_adlist') {
+    // Edit adlist identified by ID
+    try {
+        $stmt = $db->prepare('UPDATE adlist SET enabled=:enabled, comment=:comment WHERE id = :id');
+        if (!$stmt) {
+            throw new Exception('While preparing statement: ' . $db->lastErrorMsg());
+        }
+
+        $status = intval($_POST['status']);
+        if ($status !== 0) {
+                $status = 1;
+        }
+    
+        if (!$stmt->bindValue(':enabled', $status, SQLITE3_INTEGER)) {
+            throw new Exception('While binding enabled: ' . $db->lastErrorMsg());
+        }
+
+        $comment = $_POST['comment'];
+        if (strlen($comment) == 0) {
+                // Store NULL in database for empty comments
+                $comment = null;
+        }
+        if (!$stmt->bindValue(':comment', $comment, SQLITE3_TEXT)) {
+            throw new Exception('While binding comment: ' . $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: ' . $db->lastErrorMsg());
+        }
+
+        $stmt = $db->prepare('DELETE FROM adlist_by_group WHERE adlist_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());
+        }
+        
+        $db->query('BEGIN TRANSACTION;');
+        foreach ($_POST['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());
+            }
+    
+            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;');
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} elseif ($_POST['action'] == 'delete_adlist') {
+    // Delete adlist identified by ID
+    try {
+        $stmt = $db->prepare('DELETE FROM adlist_by_group WHERE adlist_id=:id');
+        if (!$stmt) {
+            throw new Exception('While preparing adlist_by_group statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
+            throw new Exception('While binding id to adlist_by_group statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing adlist_by_group statement: ' . $db->lastErrorMsg());
+        }
+
+        $stmt = $db->prepare('DELETE FROM adlist WHERE id=:id');
+        if (!$stmt) {
+            throw new Exception('While preparing adlist statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER)) {
+            throw new Exception('While binding id to adlist statement: ' . $db->lastErrorMsg());
+        }
+
+        if (!$stmt->execute()) {
+            throw new Exception('While executing adlist statement: ' . $db->lastErrorMsg());
+        }
+
+        $reload = true;
+        return JSON_success();
+    } catch (\Exception $ex) {
+        return JSON_error($ex->getMessage());
+    }
+} else {
+    log_and_die('Requested action not supported!');
+}
+// Reload lists in pihole-FTL after having added something
+if ($reload) {
+    echo shell_exec('sudo pihole restartdns reload-lists');
+}

scripts/pi-hole/php/header.php

@@ -8,6 +8,7 @@
 
     require "scripts/pi-hole/php/auth.php";
     require "scripts/pi-hole/php/password.php";
+    $scriptname = basename($_SERVER['SCRIPT_FILENAME']);
 
     check_cors();
 
@@ -182,7 +183,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://api.github.com; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://api.github.com; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'">
     <title>Pi-hole Admin Console</title>
     <!-- Usually browsers proactively perform domain name resolution on links that the user may choose to follow. We disable DNS prefetching here -->
     <meta http-equiv="x-dns-prefetch-control" content="off">
@@ -209,6 +210,7 @@
 
     <link rel="stylesheet" href="style/vendor/AdminLTE.min.css">
     <link rel="stylesheet" href="style/vendor/skin-blue.min.css">
+    <link rel="stylesheet" href="style/vendor/animate.css">
 
     <link rel="stylesheet" href="style/pi-hole.css">
     <noscript><link rel="stylesheet" href="style/vendor/js-warn.css"></noscript>
@@ -217,6 +219,15 @@
     <script src="scripts/vendor/jquery-ui.min.js"></script>
     <script src="style/vendor/bootstrap/js/bootstrap.min.js"></script>
     <script src="scripts/vendor/app.min.js"></script>
+    <script src="scripts/vendor/bootstrap-notify.min.js"></script>
+
+<?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?>
+    <script src="style/vendor/bootstrap/js/bootstrap-multiselect.js"></script>
+    <link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap-multiselect.css">
+    <script src="style/vendor/bootstrap/js/bootstrap-toggle.min.js"></script>
+    <link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap-toggle.min.css">
+    <script src="scripts/vendor/moment.min.js"></script>
+<?php } ?>
 
     <script src="scripts/vendor/jquery.dataTables.min.js"></script>
     <script src="scripts/vendor/dataTables.bootstrap.min.js"></script>
@@ -416,7 +427,6 @@ if($auth) {
             </div>
             <!-- sidebar menu: : style can be found in sidebar.less -->
             <?php
-            $scriptname = basename($_SERVER['SCRIPT_FILENAME']);
             if($scriptname === "list.php")
             {
                 if($_GET["l"] === "white")
@@ -485,6 +495,37 @@ if($auth) {
                         <i class="fa fa-ban"></i> <span>Blacklist</span>
                     </a>
                 </li>
+                <!-- Group Management -->
+                <li class="treeview <?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?>active<?php } ?>">
+                  <a href="#">
+                    <span class="pull-right-container">
+                      <i class="fa fa-angle-down pull-right" style="padding-right: 5px;"></i>
+                    </span>
+                    <i class="fa fa-users-cog"></i> <span>Group Management</span>
+                  </a>
+                  <ul class="treeview-menu">
+                    <li<?php if($scriptname === "groups.php"){ ?> class="active"<?php } ?>>
+                        <a href="groups.php">
+                            <i class="fa fa-user-friends"></i> <span>Groups</span>
+                        </a>
+                    </li>
+                    <li<?php if($scriptname === "groups-clients.php"){ ?> class="active"<?php } ?>>
+                        <a href="groups-clients.php">
+                            <i class="fa fa-laptop"></i> <span>Clients</span>
+                        </a>
+                    </li>
+                    <li<?php if($scriptname === "groups-domains.php"){ ?> class="active"<?php } ?>>
+                        <a href="groups-domains.php">
+                            <i class="fa fa-list"></i> <span>Domains</span>
+                        </a>
+                    </li>
+                    <li<?php if($scriptname === "groups-adlists.php"){ ?> class="active"<?php } ?>>
+                        <a href="groups-adlists.php">
+                            <i class="fa fa-shield-alt"></i> <span>Adlists</span>
+                        </a>
+                    </li>
+                  </ul>
+                </li>
                 <!-- Toggle -->
                 <li id="pihole-disable" class="treeview"<?php if ($pistatus == "0") { ?> hidden="true"<?php } ?>>
                   <a href="#">

scripts/pi-hole/php/teleporter.php

@@ -415,6 +415,7 @@ else
 	archive_add_table("domain_audit.json", "domain_audit");
 	archive_add_file("/etc/pihole/","setupVars.conf");
 	archive_add_file("/etc/pihole/","dhcp.leases");
+	archive_add_file("/etc/","hosts","etc/");
 	archive_add_directory("/etc/dnsmasq.d/","dnsmasq.d/");
 
 	$archive->compress(Phar::GZ); // Creates a gziped copy