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

Fix api.php?status ( replicate #2031 and pi-hole/pi-hole#4485) (#2052)

Browse Source 
* Replicating changes made by other PRs

(#2031 and pi-hole/pi-hole#4485)

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>

* Use the same messages used in #2031

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>

* Keep the old responses to avoid break things

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>

* More comments less variables

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
This commit is contained in:
RD WebDesign
2022-01-06 19:12:26 -03:00
committed by GitHub
parent 031f83980e
commit 7bb82d0cff
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
api.php
View File

@@ -18,28 +18,30 @@ $FTL_IP = "127.0.0.1";
$data = array();
// Common API functions
if (isset($_GET['status']))
{
$pistatus = pihole_execute('status web');
if(isset($pistatus[0]))
{
$pistatus = $pistatus[0];
if (isset($_GET['status'])) {
// Receive the return of "pihole status web"
$pistatus = pihole_execute('status web');
if (isset($pistatus[0])) {
$pistatus = intval($pistatus[0]);
} else {
// If no response, status="Unknown" (-2)
$pistatus = -2;
}
else
{
$pistatus = null;
switch ($pistatus) {
case -2: // Unkown
case -1: // DNS service not running"
case 0: // Offline
$data = array_merge($data, array("status" => "disabled"));
break;
default:
// DNS service on port $returncode
$data = array_merge($data, array("status" => "enabled"));
}
if ($pistatus === "1")
{
$data = array_merge($data, array("status" => "enabled"));
}
else
{
$data = array_merge($data, array("status" => "disabled"));
}
}
elseif (isset($_GET['enable']) && $auth)
{
} elseif (isset($_GET['enable']) && $auth) {
if(isset($_GET["auth"]))
{
if($_GET["auth"] !== $pwhash)
@@ -165,12 +167,9 @@ elseif (isset($_GET['list']))
require("api_FTL.php");
header('Content-type: application/json');
if(isset($_GET["jsonForceObject"]))
{
echo json_encode($data, JSON_FORCE_OBJECT);
}
else
{
echo json_encode($data);
if(isset($_GET["jsonForceObject"])) {
echo json_encode($data, JSON_FORCE_OBJECT);
} else {
echo json_encode($data);
}
?>