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

Use single quotes almost everywhere, use !== where appropriate, fix formatting and simplify the code in some places.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-12-14 12:13:22 +00:00
parent aa6c4c88f3
commit b791c29440
1 changed files with 178 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,52 +16,52 @@ if(isset($_POST['token']))
}
else
{
log_and_die("Not allowed!");
log_and_die('Not allowed!');
}
$reload = false;
require_once("func.php");
require_once("database.php");
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));
echo json_encode(array('success' => true, 'message' => $message));
}
function JSON_error($message = null)
{
header('Content-type: application/json');
$response = array("success" => false, "message" => $message);
$response = array('success' => false, 'message' => $message);
if(isset($_POST['action']))
{
array_push($response, array("action" => $_POST['action']));
array_push($response, array('action' => $_POST['action']));
}
echo json_encode($response);
}
if($_POST['action'] == "get_groups")
if($_POST['action'] == 'get_groups')
{
// List all available groups
try
{
$query = $db->query("SELECT * FROM \"group\";");
$query = $db->query('SELECT * FROM "group";');
$data = array();
while(($res = $query->fetchArray(SQLITE3_ASSOC)) != false)
while(($res = $query->fetchArray(SQLITE3_ASSOC)) !== false)
{
array_push($data,$res);
}
echo json_encode(array("data" => $data));
echo json_encode(array('data' => $data));
}
catch (\Exception $ex)
{
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "add_group")
elseif($_POST['action'] == 'add_group')
{
// Add new group
try
@@ -69,22 +69,22 @@ elseif($_POST['action'] == "add_group")
$stmt = $db->prepare('INSERT INTO "group" (name,description) VALUES (:name,:desc)');
if(!$stmt)
{
throw new Exception("While preparing statement: ".$db->lastErrorMsg());
throw new Exception('While preparing statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':name', $_POST["name"], SQLITE3_TEXT))
if(!$stmt->bindValue(':name', $_POST['name'], SQLITE3_TEXT))
{
throw new Exception("While binding name: ".$db->lastErrorMsg());
throw new Exception('While binding name: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':desc', $_POST["desc"], SQLITE3_TEXT))
if(!$stmt->bindValue(':desc', $_POST['desc'], SQLITE3_TEXT))
{
throw new Exception("While binding desc: ".$db->lastErrorMsg());
throw new Exception('While binding desc: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing: ".$db->lastErrorMsg());
throw new Exception('While executing: '.$db->lastErrorMsg());
}
$reload = true;
@@ -95,7 +95,7 @@ elseif($_POST['action'] == "add_group")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "edit_group")
elseif($_POST['action'] == 'edit_group')
{
// Edit group identified by ID
try
@@ -103,44 +103,39 @@ elseif($_POST['action'] == "edit_group")
$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());
throw new Exception('While preparing statement: '.$db->lastErrorMsg());
}
$status = intval($_POST["status"]);
if($status !== 0)
{
$status = 1;
}
$status = ((int) $_POST['status']) !== 0 ? 1 : 0;
if(!$stmt->bindValue(':enabled', $status, SQLITE3_INTEGER))
{
throw new Exception("While binding enabled: ".$db->lastErrorMsg());
throw new Exception('While binding enabled: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':name', $_POST["name"], SQLITE3_TEXT))
if(!$stmt->bindValue(':name', $_POST['name'], SQLITE3_TEXT))
{
throw new Exception("While binding name: ".$db->lastErrorMsg());
throw new Exception('While binding name: '.$db->lastErrorMsg());
}
$desc = $_POST["desc"];
$desc = $_POST['desc'];
if(strlen($desc) == 0)
{
// Store NULL in database for empty descriptions
$desc = null;
// Store NULL in database for empty descriptions
$desc = null;
}
if(!$stmt->bindValue(':desc', $desc, SQLITE3_TEXT))
{
throw new Exception("While binding desc: ".$db->lastErrorMsg());
throw new Exception('While binding desc: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing: ".$db->lastErrorMsg());
throw new Exception('While executing: '.$db->lastErrorMsg());
}
$reload = true;
@@ -151,7 +146,7 @@ elseif($_POST['action'] == "edit_group")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "delete_group")
elseif($_POST['action'] == 'delete_group')
{
// Delete group identified by ID
try
@@ -159,17 +154,17 @@ elseif($_POST['action'] == "delete_group")
$stmt = $db->prepare('DELETE FROM "group" WHERE id=:id');
if(!$stmt)
{
throw new Exception("While preparing statement: ".$db->lastErrorMsg());
throw new Exception('While preparing statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing: ".$db->lastErrorMsg());
throw new Exception('While executing: '.$db->lastErrorMsg());
}
$reload = true;
@@ -180,44 +175,43 @@ elseif($_POST['action'] == "delete_group")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "get_clients")
elseif($_POST['action'] == 'get_clients')
{
// List all available groups
try
{
$query = $db->query("SELECT * FROM client;");
$query = $db->query('SELECT * FROM client;');
if(!$query)
{
throw new Exception("Error while querying gravity's client table: ".$db->lastErrorMsg());
throw new Exception('Error while querying gravity\'s client table: '.$db->lastErrorMsg());
}
$data = array();
while(($res = $query->fetchArray(SQLITE3_ASSOC)) != false)
while(($res = $query->fetchArray(SQLITE3_ASSOC)) !== false)
{
$group_query = $db->query("SELECT group_id FROM client_by_group WHERE client_id = ".$res["id"].";");
$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());
throw new Exception('Error while querying gravity\'s client_by_group table: '.$db->lastErrorMsg());
}
$groups = array();
while($gres = $group_query->fetchArray(SQLITE3_ASSOC))
{
array_push($groups,$gres["group_id"]);
array_push($groups,$gres['group_id']);
}
$res["groups"] = $groups;
$res['groups'] = $groups;
array_push($data,$res);
}
echo json_encode(array("data" => $data));
echo json_encode(array('data' => $data));
}
catch (\Exception $ex)
{
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "get_unconfigured_clients")
elseif($_POST['action'] == 'get_unconfigured_clients')
{
// List all available clients WITHOUT already configured clients
try
@@ -225,31 +219,31 @@ elseif($_POST['action'] == "get_unconfigured_clients")
$QUERYDB = getQueriesDBFilename();
$FTLdb = SQLite3_connect($QUERYDB);
$query = $FTLdb->query("SELECT DISTINCT ip FROM network_addresses ORDER BY ip ASC;");
$query = $FTLdb->query('SELECT DISTINCT ip FROM network_addresses ORDER BY ip ASC;');
if(!$query)
{
throw new Exception("Error while querying FTL's database: ".$db->lastErrorMsg());
throw new Exception('Error while querying FTL\'s database: '.$db->lastErrorMsg());
}
// Loop over results
$ips = array();
while($res = $query->fetchArray(SQLITE3_ASSOC))
{
array_push($ips,$res["ip"]);
array_push($ips,$res['ip']);
}
$FTLdb->close();
$query = $db->query("SELECT ip FROM client;");
$query = $db->query('SELECT ip FROM client;');
if(!$query)
{
throw new Exception("Error while querying gravity's database: ".$db->lastErrorMsg());
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)
while(($res = $query->fetchArray(SQLITE3_ASSOC)) !== false)
{
$idx = array_search($res["ip"], $ips);
if($idx != false)
$idx = array_search($res['ip'], $ips);
if($idx !== false)
{
unset($ips[$idx]);
}
@@ -262,7 +256,7 @@ elseif($_POST['action'] == "get_unconfigured_clients")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "add_client")
elseif($_POST['action'] == 'add_client')
{
// Add new client
try
@@ -270,17 +264,17 @@ elseif($_POST['action'] == "add_client")
$stmt = $db->prepare('INSERT INTO client (ip) VALUES (:ip)');
if(!$stmt)
{
throw new Exception("While preparing statement: ".$db->lastErrorMsg());
throw new Exception('While preparing statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':ip', $_POST["ip"], SQLITE3_TEXT))
if(!$stmt->bindValue(':ip', $_POST['ip'], SQLITE3_TEXT))
{
throw new Exception("While binding ip: ".$db->lastErrorMsg());
throw new Exception('While binding ip: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing: ".$db->lastErrorMsg());
throw new Exception('While executing: '.$db->lastErrorMsg());
}
$reload = true;
@@ -291,7 +285,7 @@ elseif($_POST['action'] == "add_client")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "edit_client")
elseif($_POST['action'] == 'edit_client')
{
// Edit client identified by ID
try
@@ -299,44 +293,44 @@ elseif($_POST['action'] == "edit_client")
$stmt = $db->prepare('DELETE FROM client_by_group WHERE client_id = :id');
if(!$stmt)
{
throw new Exception("While preparing DELETE statement: ".$db->lastErrorMsg());
throw new Exception('While preparing DELETE statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing DELETE statement: ".$db->lastErrorMsg());
throw new Exception('While executing DELETE statement: '.$db->lastErrorMsg());
}
$db->query("BEGIN TRANSACTION;");
foreach ($_POST["groups"] as $gid)
$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());
throw new Exception('While preparing INSERT INTO statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':gid', intval($gid), SQLITE3_INTEGER))
{
throw new Exception("While binding gid: ".$db->lastErrorMsg());
throw new Exception('While binding gid: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing INSERT INTO statement: ".$db->lastErrorMsg());
throw new Exception('While executing INSERT INTO statement: '.$db->lastErrorMsg());
}
}
$db->query("COMMIT;");
$db->query('COMMIT;');
$reload = true;
return JSON_success();
@@ -346,7 +340,7 @@ elseif($_POST['action'] == "edit_client")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "delete_client")
elseif($_POST['action'] == 'delete_client')
{
// Delete client identified by ID
try
@@ -354,33 +348,33 @@ elseif($_POST['action'] == "delete_client")
$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());
throw new Exception('While preparing client_by_group statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id to client_by_group statement: ".$db->lastErrorMsg());
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());
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());
throw new Exception('While preparing client statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id to client statement: ".$db->lastErrorMsg());
throw new Exception('While binding id to client statement: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing client statement: ".$db->lastErrorMsg());
throw new Exception('While executing client statement: '.$db->lastErrorMsg());
}
$reload = true;
@@ -391,44 +385,44 @@ elseif($_POST['action'] == "delete_client")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "get_domains")
elseif($_POST['action'] == 'get_domains')
{
// List all available groups
try
{
$query = $db->query("SELECT * FROM domainlist;");
$query = $db->query('SELECT * FROM domainlist;');
if(!$query)
{
throw new Exception("Error while querying gravity's domainlist table: ".$db->lastErrorMsg());
throw new Exception('Error while querying gravity\'s domainlist table: '.$db->lastErrorMsg());
}
$data = array();
while(($res = $query->fetchArray(SQLITE3_ASSOC)) != false)
while(($res = $query->fetchArray(SQLITE3_ASSOC)) !== false)
{
$group_query = $db->query("SELECT group_id FROM domainlist_by_group WHERE domainlist_id = ".$res["id"].";");
$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());
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"]);
array_push($groups,$gres['group_id']);
}
$res["groups"] = $groups;
$res['groups'] = $groups;
array_push($data,$res);
}
echo json_encode(array("data" => $data));
echo json_encode(array('data' => $data));
}
catch (\Exception $ex)
{
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "add_domain")
elseif($_POST['action'] == 'add_domain')
{
// Add new domain
try
@@ -436,27 +430,27 @@ elseif($_POST['action'] == "add_domain")
$stmt = $db->prepare('INSERT INTO domainlist (domain,type,comment) VALUES (:domain,:type,:comment)');
if(!$stmt)
{
throw new Exception("While preparing statement: ".$db->lastErrorMsg());
throw new Exception('While preparing statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':domain', $_POST["domain"], SQLITE3_TEXT))
if(!$stmt->bindValue(':domain', $_POST['domain'], SQLITE3_TEXT))
{
throw new Exception("While binding domain: ".$db->lastErrorMsg());
throw new Exception('While binding domain: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':type', intval($_POST["type"]), SQLITE3_TEXT))
if(!$stmt->bindValue(':type', intval($_POST['type']), SQLITE3_TEXT))
{
throw new Exception("While binding type: ".$db->lastErrorMsg());
throw new Exception('While binding type: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':comment', $_POST["comment"], SQLITE3_TEXT))
if(!$stmt->bindValue(':comment', $_POST['comment'], SQLITE3_TEXT))
{
throw new Exception("While binding comment: ".$db->lastErrorMsg());
throw new Exception('While binding comment: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing: ".$db->lastErrorMsg());
throw new Exception('While executing: '.$db->lastErrorMsg());
}
$reload = true;
@@ -467,7 +461,7 @@ elseif($_POST['action'] == "add_domain")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "edit_domain")
elseif($_POST['action'] == 'edit_domain')
{
// Edit domain identified by ID
try
@@ -475,10 +469,10 @@ elseif($_POST['action'] == "edit_domain")
$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());
throw new Exception('While preparing statement: '.$db->lastErrorMsg());
}
$status = intval($_POST["status"]);
$status = intval($_POST['status']);
if($status !== 0)
{
$status = 1;
@@ -486,10 +480,10 @@ elseif($_POST['action'] == "edit_domain")
if(!$stmt->bindValue(':enabled', $status, SQLITE3_INTEGER))
{
throw new Exception("While binding enabled: ".$db->lastErrorMsg());
throw new Exception('While binding enabled: '.$db->lastErrorMsg());
}
$comment = $_POST["comment"];
$comment = $_POST['comment'];
if(strlen($comment) == 0)
{
// Store NULL in database for empty comments
@@ -497,65 +491,65 @@ elseif($_POST['action'] == "edit_domain")
}
if(!$stmt->bindValue(':comment', $comment, SQLITE3_TEXT))
{
throw new Exception("While binding comment: ".$db->lastErrorMsg());
throw new Exception('While binding comment: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':type', intval($_POST["type"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':type', intval($_POST['type']), SQLITE3_INTEGER))
{
throw new Exception("While binding type: ".$db->lastErrorMsg());
throw new Exception('While binding type: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing: ".$db->lastErrorMsg());
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());
throw new Exception('While preparing DELETE statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing DELETE statement: ".$db->lastErrorMsg());
throw new Exception('While executing DELETE statement: '.$db->lastErrorMsg());
}
$db->query("BEGIN TRANSACTION;");
foreach ($_POST["groups"] as $gid)
$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());
throw new Exception('While preparing INSERT INTO statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':gid', intval($gid), SQLITE3_INTEGER))
{
throw new Exception("While binding gid: ".$db->lastErrorMsg());
throw new Exception('While binding gid: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing INSERT INTO statement: ".$db->lastErrorMsg());
throw new Exception('While executing INSERT INTO statement: '.$db->lastErrorMsg());
}
}
$db->query("COMMIT;");
$db->query('COMMIT;');
$reload = true;
return JSON_success();
@@ -565,7 +559,7 @@ elseif($_POST['action'] == "edit_domain")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "delete_domain")
elseif($_POST['action'] == 'delete_domain')
{
// Delete domain identified by ID
try
@@ -573,33 +567,33 @@ elseif($_POST['action'] == "delete_domain")
$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());
throw new Exception('While preparing domainlist_by_group statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id to domainlist_by_group statement: ".$db->lastErrorMsg());
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());
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());
throw new Exception('While preparing domainlist statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id to domainlist statement: ".$db->lastErrorMsg());
throw new Exception('While binding id to domainlist statement: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing domainlist statement: ".$db->lastErrorMsg());
throw new Exception('While executing domainlist statement: '.$db->lastErrorMsg());
}
$reload = true;
@@ -610,44 +604,44 @@ elseif($_POST['action'] == "delete_domain")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "get_adlists")
elseif($_POST['action'] == 'get_adlists')
{
// List all available groups
try
{
$query = $db->query("SELECT * FROM adlist;");
$query = $db->query('SELECT * FROM adlist;');
if(!$query)
{
throw new Exception("Error while querying gravity's adlist table: ".$db->lastErrorMsg());
throw new Exception('Error while querying gravity\'s adlist table: '.$db->lastErrorMsg());
}
$data = array();
while(($res = $query->fetchArray(SQLITE3_ASSOC)) != false)
while(($res = $query->fetchArray(SQLITE3_ASSOC)) !== false)
{
$group_query = $db->query("SELECT group_id FROM adlist_by_group WHERE adlist_id = ".$res["id"].";");
$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());
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"]);
array_push($groups,$gres['group_id']);
}
$res["groups"] = $groups;
$res['groups'] = $groups;
array_push($data,$res);
}
echo json_encode(array("data" => $data));
echo json_encode(array('data' => $data));
}
catch (\Exception $ex)
{
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "add_adlist")
elseif($_POST['action'] == 'add_adlist')
{
// Add new adlist
try
@@ -655,22 +649,22 @@ elseif($_POST['action'] == "add_adlist")
$stmt = $db->prepare('INSERT INTO adlist (address,comment) VALUES (:address,:comment)');
if(!$stmt)
{
throw new Exception("While preparing statement: ".$db->lastErrorMsg());
throw new Exception('While preparing statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':address', $_POST["address"], SQLITE3_TEXT))
if(!$stmt->bindValue(':address', $_POST['address'], SQLITE3_TEXT))
{
throw new Exception("While binding address: ".$db->lastErrorMsg());
throw new Exception('While binding address: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':comment', $_POST["comment"], SQLITE3_TEXT))
if(!$stmt->bindValue(':comment', $_POST['comment'], SQLITE3_TEXT))
{
throw new Exception("While binding comment: ".$db->lastErrorMsg());
throw new Exception('While binding comment: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing: ".$db->lastErrorMsg());
throw new Exception('While executing: '.$db->lastErrorMsg());
}
$reload = true;
@@ -681,7 +675,7 @@ elseif($_POST['action'] == "add_adlist")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "edit_adlist")
elseif($_POST['action'] == 'edit_adlist')
{
// Edit adlist identified by ID
try
@@ -689,10 +683,10 @@ elseif($_POST['action'] == "edit_adlist")
$stmt = $db->prepare('UPDATE adlist SET enabled=:enabled, comment=:comment WHERE id = :id');
if(!$stmt)
{
throw new Exception("While preparing statement: ".$db->lastErrorMsg());
throw new Exception('While preparing statement: '.$db->lastErrorMsg());
}
$status = intval($_POST["status"]);
$status = intval($_POST['status']);
if($status !== 0)
{
$status = 1;
@@ -700,10 +694,10 @@ elseif($_POST['action'] == "edit_adlist")
if(!$stmt->bindValue(':enabled', $status, SQLITE3_INTEGER))
{
throw new Exception("While binding enabled: ".$db->lastErrorMsg());
throw new Exception('While binding enabled: '.$db->lastErrorMsg());
}
$comment = $_POST["comment"];
$comment = $_POST['comment'];
if(strlen($comment) == 0)
{
// Store NULL in database for empty comments
@@ -711,60 +705,60 @@ elseif($_POST['action'] == "edit_adlist")
}
if(!$stmt->bindValue(':comment', $comment, SQLITE3_TEXT))
{
throw new Exception("While binding comment: ".$db->lastErrorMsg());
throw new Exception('While binding comment: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing: ".$db->lastErrorMsg());
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());
throw new Exception('While preparing DELETE statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing DELETE statement: ".$db->lastErrorMsg());
throw new Exception('While executing DELETE statement: '.$db->lastErrorMsg());
}
$db->query("BEGIN TRANSACTION;");
foreach ($_POST["groups"] as $gid)
$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());
throw new Exception('While preparing INSERT INTO statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id: ".$db->lastErrorMsg());
throw new Exception('While binding id: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':gid', intval($gid), SQLITE3_INTEGER))
{
throw new Exception("While binding gid: ".$db->lastErrorMsg());
throw new Exception('While binding gid: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing INSERT INTO statement: ".$db->lastErrorMsg());
throw new Exception('While executing INSERT INTO statement: '.$db->lastErrorMsg());
}
}
$db->query("COMMIT;");
$db->query('COMMIT;');
$reload = true;
return JSON_success();
@@ -774,7 +768,7 @@ elseif($_POST['action'] == "edit_adlist")
return JSON_error($ex->getMessage());
}
}
elseif($_POST['action'] == "delete_adlist")
elseif($_POST['action'] == 'delete_adlist')
{
// Delete adlist identified by ID
try
@@ -782,33 +776,33 @@ elseif($_POST['action'] == "delete_adlist")
$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());
throw new Exception('While preparing adlist_by_group statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id to adlist_by_group statement: ".$db->lastErrorMsg());
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());
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());
throw new Exception('While preparing adlist statement: '.$db->lastErrorMsg());
}
if(!$stmt->bindValue(':id', intval($_POST["id"]), SQLITE3_INTEGER))
if(!$stmt->bindValue(':id', intval($_POST['id']), SQLITE3_INTEGER))
{
throw new Exception("While binding id to adlist statement: ".$db->lastErrorMsg());
throw new Exception('While binding id to adlist statement: '.$db->lastErrorMsg());
}
if(!$stmt->execute())
{
throw new Exception("While executing adlist statement: ".$db->lastErrorMsg());
throw new Exception('While executing adlist statement: '.$db->lastErrorMsg());
}
$reload = true;
@@ -821,11 +815,11 @@ elseif($_POST['action'] == "delete_adlist")
}
else
{
log_and_die("Requested action not supported!");
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");
echo shell_exec('sudo pihole restartdns reload-lists');
}
?>