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

* Replicating changes made by other PRs (#2031 and pi-hole/pi-hole#4485) Signed-off-by: rdwebdesign <[email protected]> * Use the same messages used in #2031 Signed-off-by: rdwebdesign <[email protected]> * Keep the old responses to avoid break things Signed-off-by: rdwebdesign <[email protected]> * More comments less variables Signed-off-by: rdwebdesign <[email protected]>
pi-hole · Jan 6, 2022 · 7bb82d0 · 7bb82d0
1 parent 031f839
commit 7bb82d0
Showing 1 changed file with 26 additions and 27 deletions.
diff --git a/api.php b/api.php
@@ -18,28 +18,30 @@
 $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 @@
 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);
 }
 ?>