From 74656c63ed994a746571275f83c3cea983315c8d Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Tue, 28 Nov 2023 10:05:06 +0000
Subject: [PATCH] Update templates w/ getLogLimited, add $logdata to payload

---
 includes/adblock.php          | 3 ++-
 includes/dhcp.php             | 6 +++++-
 includes/hostapd.php          | 5 ++++-
 templates/adblock/logging.php | 2 +-
 templates/dhcp/logging.php    | 4 +---
 templates/hostapd/logging.php | 4 +---
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/includes/adblock.php b/includes/adblock.php
index 0d171e25..ec6fb38d 100755
--- a/includes/adblock.php
+++ b/includes/adblock.php
@@ -92,6 +92,7 @@ function DisplayAdBlockConfig()
     } else {
         $adblock_log = "Unable to open log file";
     }
+    $logdata = getLogLimited(RASPI_DHCPCD_LOG, $adblock_log);
 
     echo renderTemplate(
         "adblock", compact(
@@ -101,7 +102,7 @@ function DisplayAdBlockConfig()
         "enabled",
         "custom_enabled",
         "adblock_custom_content",
-        "adblock_log"
+        "logdata"
         )
     );
 }
diff --git a/includes/dhcp.php b/includes/dhcp.php
index 1c6b500c..b1167457 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -60,6 +60,9 @@ function DisplayDHCPConfig()
     count($log_dhcp) > 0 ? $conf['log-dhcp'] = true : false ;
     count($log_queries) > 0 ? $conf['log-queries'] = true : false ;
 
+    exec('sudo /bin/chmod o+r '.RASPI_DHCPCD_LOG);
+    $logdata = getLogLimited(RASPI_DHCPCD_LOG);
+
     echo renderTemplate(
         "dhcp", compact(
             "status",
@@ -70,7 +73,8 @@ function DisplayDHCPConfig()
             "hosts",
             "upstreamServers",
             "interfaces",
-            "leases"
+            "leases",
+            "logdata"
         )
     );
 }
diff --git a/includes/hostapd.php b/includes/hostapd.php
index 7fe54134..3ca11356 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -135,6 +135,8 @@ function DisplayHostAPDConfig()
             $selectedHwMode = 'w';
         }
     }
+    exec('sudo /bin/chmod o+r '.RASPI_HOSTAPD_LOG);
+    $logdata = getLogLimited(RASPI_HOSTAPD_LOG);
 
     echo renderTemplate(
         "hostapd", compact(
@@ -153,7 +155,8 @@ function DisplayHostAPDConfig()
             "arrHostapdConf",
             "operatingSystem",
             "selectedHwMode",
-            "countryCodes"
+            "countryCodes",
+            "logdata"
         )
     );
 }
diff --git a/templates/adblock/logging.php b/templates/adblock/logging.php
index 8378e68d..2140ae71 100644
--- a/templates/adblock/logging.php
+++ b/templates/adblock/logging.php
@@ -3,7 +3,7 @@
   <h4 class="mt-3"><?php echo _("Logging"); ?></h4>
     <div class="row">
       <div class="form-group col-md-8">
-        <?php echo '<textarea class="logoutput">'.htmlspecialchars($adblock_log, ENT_QUOTES).'</textarea>'; ?>
+        <?php echo '<textarea class="logoutput">'.htmlspecialchars($logdata, ENT_QUOTES).'</textarea>'; ?>
     </div>
   </div>
 </div><!-- /.tab-pane -->
diff --git a/templates/dhcp/logging.php b/templates/dhcp/logging.php
index 6050e102..7243c7a5 100644
--- a/templates/dhcp/logging.php
+++ b/templates/dhcp/logging.php
@@ -17,9 +17,7 @@
     <div class="form-group col-md-8 mt-2">
       <?php
       if ($conf['log-dhcp'] == 1 || $conf['log-queries'] == 1) {
-          exec('sudo /bin/chmod o+r '.RASPI_DHCPCD_LOG);
-          $log = file_get_contents(RASPI_DHCPCD_LOG);
-          echo '<textarea class="logoutput" id="dnsmasq-log">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
+          echo '<textarea class="logoutput" id="dnsmasq-log">'.htmlspecialchars($logdata, ENT_QUOTES).'</textarea>';
       } else {
           echo '<textarea class="logoutput my-3"></textarea>';
       }
diff --git a/templates/hostapd/logging.php b/templates/hostapd/logging.php
index 0994f88e..f5b646db 100644
--- a/templates/hostapd/logging.php
+++ b/templates/hostapd/logging.php
@@ -14,9 +14,7 @@
     <div class="form-group col-md-8 mt-2">
       <?php
       if ($arrHostapdConf['LogEnable'] == 1) {
-          exec('sudo /bin/chmod o+r /tmp/hostapd.log');
-          $log = file_get_contents('/tmp/hostapd.log');
-          echo '<textarea class="logoutput" id="hostapd-log">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
+          echo '<textarea class="logoutput" id="hostapd-log">'.htmlspecialchars($logdata, ENT_QUOTES).'</textarea>';
       } else {
           echo '<textarea class="logoutput my-3"></textarea>';
       }