From 9a5f62aba7a148cd3edaa511ec35679491acc6d0 Mon Sep 17 00:00:00 2001
From: yubiuser <ckoenig@posteo.de>
Date: Sat, 8 Jan 2022 21:01:57 +0100
Subject: [PATCH] Use piholeStatus() in header.php (#2062)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use piholeStatus() in header.php

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove check for null

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/php/header.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index b3d783c9..d8ad253b 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -9,6 +9,7 @@
     require "scripts/pi-hole/php/auth.php";
     require "scripts/pi-hole/php/password.php";
     require_once "scripts/pi-hole/php/FTL.php";
+    require_once "scripts/pi-hole/php/func.php";
     require "scripts/pi-hole/php/theme.php";
     $scriptname = basename($_SERVER['SCRIPT_FILENAME']);
     $hostname = gethostname() ? gethostname() : "";
@@ -333,19 +334,14 @@ if($auth) {
                 <div class="pull-left info">
                     <p>Status</p>
                     <?php
-                    $pistatus = pihole_execute('status web');
-                    if (isset($pistatus[0])) {
-                        $pistatus = intval($pistatus[0]);
-                    } else {
-                        $pistatus = null;
-                    }
+                    $pistatus = piholeStatus();
                     if ($pistatus == 53) {
                         echo '<span id="status"><i class="fa fa-w fa-circle text-green-light"></i> Active</span>';
                     } elseif ($pistatus == 0) {
                         echo '<span id="status"><i class="fa fa-w fa-circle text-red"></i> Offline</span>';
                     } elseif ($pistatus == -1) {
                         echo '<span id="status"><i class="fa fa-w fa-circle text-red"></i> DNS service not running</span>';
-                    } elseif ($pistatus == -2 || is_null($pistatus)) {
+                    } elseif ($pistatus == -2) {
                         echo '<span id="status"><i class="fa fa-w fa-circle text-red"></i> Unknown</span>';
                     } else {
                         echo '<span id="status"><i class="fa fa-w fa-circle text-orange"></i> DNS service on port '.$pistatus.'</span>';