From 6ecee71a6b99f8da785cb24321dcc6bab43e3f97 Mon Sep 17 00:00:00 2001
From: Martin Wasley <martin@queens-park.com>
Date: Tue, 8 Jan 2019 07:03:53 +0000
Subject: [PATCH] Fix dhcp leasetime ( timezone ) display

Config for dhcpleaseinlocaltime was not being wrtten to the config. Corrected leasetine display routine.
---
 src/www/services_dhcp.php      |  3 +++
 src/www/status_dhcp_leases.php | 26 +++++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index 67c95fb53..9f9772f67 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -427,6 +427,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             if (!empty($pconfig['ntp2'])) {
                 $dhcpdconf['ntpserver'][] = $pconfig['ntp2'];
             }
+			if (!empty($pconfig['dhcpleaseinlocaltime'])) {
+                $dhcpdconf['ntpserver'][] = $pconfig['dhcpleaseinlocaltime'];
+            }
 
             // handle changes
             if (!isset($pool) && $act != "newpool") {
diff --git a/src/www/status_dhcp_leases.php b/src/www/status_dhcp_leases.php
index 1baf34bdb..71d1fad44 100644
--- a/src/www/status_dhcp_leases.php
+++ b/src/www/status_dhcp_leases.php
@@ -37,18 +37,30 @@ function adjust_gmt($dt)
 {
     global $config;
 
+   $dhcpleaseinlocaltime = 'no';
     $dhcpd = array();
-    if (isset($config['dhcpd'])) {
+	
+	if (is_array($config['dhcpd'])) {
         $dhcpd = $config['dhcpd'];
-    }
-
-    foreach ($dhcpd as $dhcpditem) {
-        if (isset($dhcpditem['dhcpleaseinlocaltime']) && $dhcpleaseinlocaltime == "yes") {
-            $ts = strtotime($dt . " GMT");
-            return strftime("%Y/%m/%d %I:%M:%S%p", $ts);
+        foreach ($dhcpd as $dhcpleaseinlocaltime) {
+            $dhcpleaseinlocaltime = $dhcpleaseinlocaltime['dhcpleaseinlocaltime'];
+            if ($dhcpleaseinlocaltime == "yes") {
+                break;
+            }
         }
     }
 
+    $timezone = $config['system']['timezone'];
+    $ts = strtotime($dt . " GMT");
+    if ($dhcpleaseinlocaltime != "yes") {
+        $this_tz = new DateTimeZone($timezone);
+        $dhcp_lt = new DateTime(strftime("%I:%M:%S%p", $ts), $this_tz);
+        $offset = $this_tz->getOffset($dhcp_lt);
+        $ts = $ts - $offset;
+        return strftime("%Y/%m/%d %I:%M:%S%p", $ts);
+    } else {
+        return strftime("%Y/%m/%d %H:%M:%S", $ts);
+    }
     return $dt;
 }