From e8c259d72021efda959bcbf6655cacaf3a484266 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 22 May 2023 19:19:15 +0200
Subject: [PATCH] Use Lua Kepler syntax everywhere. Needs the most recent
 patched FTL that enforces Kepler syntax for all Lua scripts to work as
 expected.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/lua/header.lp               | 36 ++++++++--------
 scripts/pi-hole/lua/header_authenticated.lp | 26 +++++------
 scripts/pi-hole/lua/sidebar.lp              | 48 ++++++++++-----------
 settings-api.lp                             |  4 +-
 4 files changed, 56 insertions(+), 58 deletions(-)
diff --git a/scripts/pi-hole/lua/header.lp b/scripts/pi-hole/lua/header.lp
index 8afd78a6..a4a68ea7 100644
--- a/scripts/pi-hole/lua/header.lp
+++ b/scripts/pi-hole/lua/header.lp
@@ -1,6 +1,3 @@
-HTTP/1.0 200 OK
-Content-Type: text/html
-
 <!DOCTYPE html>
 <!--
 *  Pi-hole: A black hole for Internet advertisements
@@ -64,30 +61,31 @@ end
     <!-- Theme styles -->
     <meta name="theme-color" content="<?=theme.color?>">
 
-<? if theme.dark then mg.write("\
-    <style>\
-        html { background-color: #000; }\
-    </style>\
-") end ?>
+<? if theme.dark then ?>
+    <style>
+        html { background-color: #000; }
+    </style>
+<? end ?>
 
     <!-- Theme fonts -->
-<? if theme == 'lcars' then mg.write('\
-    <link rel="stylesheet" href="'..pihole.fileversion('style/vendor/fonts/ubuntu-mono/ubuntu-mono.css')..'">\
-    <link rel="stylesheet" href="'..pihole.fileversion('style/vendor/fonts/antonio/antonio.css')..'">\
-') else mg.write('\
-    <link rel="stylesheet" href="'..pihole.fileversion('style/vendor/SourceSansPro/SourceSansPro.css')..'">\
-') end ?>
+<? if theme == 'lcars' then ?>
+    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/fonts/ubuntu-mono/ubuntu-mono.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/fonts/antonio/antonio.css')?>">
+<? else ?>
+    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/SourceSansPro/SourceSansPro.css')?>">
+<? end ?>
 
     <!-- Common styles -->
     <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap/css/bootstrap.min.css')?>">
     <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/AdminLTE.min.css')?>">
     <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/select2.min.css')?>">
 
-    <? if startsWith(scriptname, 'groups') then mg.write('\
-    <!-- Group management styles -->\
-    <link rel="stylesheet" href="'..pihole.fileversion('style/vendor/animate.min.css')..'">\
-    <link rel="stylesheet" href="'..pihole.fileversion('style/vendor/bootstrap-select.min.css')..'">\
-    <link rel="stylesheet" href="'..pihole.fileversion('style/vendor/bootstrap-toggle.min.css')..'">') end ?>
+    <? if startsWith(scriptname, 'groups') then ?>
+    <!-- Group management styles -->
+    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/animate.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap-select.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap-toggle.min.css')?>">
+    <? end ?>
 
     <!-- Theme styles -->
     <link rel="stylesheet" href="<?=pihole.fileversion('style/pi-hole.css')?>">
diff --git a/scripts/pi-hole/lua/header_authenticated.lp b/scripts/pi-hole/lua/header_authenticated.lp
index 846f9e0e..78a2fe16 100644
--- a/scripts/pi-hole/lua/header_authenticated.lp
+++ b/scripts/pi-hole/lua/header_authenticated.lp
@@ -20,7 +20,7 @@ mg.include('header.lp','r')
     <script src="<?=pihole.fileversion('scripts/vendor/chart.min.js')?>"></script>
     <script src="<?=pihole.fileversion('scripts/vendor/chartjs-adapter-moment.js')?>"></script>
 </head>
-<body class="<?=pihole.webtheme()?> hold-transition sidebar-mini<? if pihole.boxedlayout() then mg.write("layout-boxed") end ?> logged-in">
+<body class="<?=pihole.webtheme()?> hold-transition sidebar-mini<? if pihole.boxedlayout() then ?>layout-boxed<? end ?> logged-in">
 <noscript>
     <!-- JS Warning -->
     <div>
@@ -53,18 +53,18 @@ mg.include('header.lp','r')
             </a>
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
-                <? if startsWith(scriptname, 'settings-') then mg.write('\
-                    <li class="nav-item">\
-                        <p class="navbar-text">\
-                            Settings level: <select id="settings-level" class="form-control input-sm">\
-                                <option value="0">Basic</option>\
-                                <option value="1">Advanced</option>\
-                                <option value="2">Expert</option>\
-                            </select>\
-                        </p>\
-                    </li>\
-                    ') end ?>
-                    <li<? if string.len(hostname) == 0 then mg.write(' class="hidden"') end ?>>
+                <? if startsWith(scriptname, 'settings-') then ?>
+                    <li class="nav-item">
+                        <p class="navbar-text">
+                            Settings level: <select id="settings-level" class="form-control input-sm">
+                                <option value="0">Basic</option>
+                                <option value="1">Advanced</option>
+                                <option value="2">Expert</option>
+                            </select>
+                        </p>
+                    </li>
+                <? end ?>
+                    <li<? if string.len(hostname) == 0 then ?> class="hidden"<? end ?>>
                         <p class="navbar-text">
                             <span class="hidden-xs">hostname:</span>
                             <code><?=hostname?></code>
diff --git a/scripts/pi-hole/lua/sidebar.lp b/scripts/pi-hole/lua/sidebar.lp
index 4ae3874a..0cc88ca8 100644
--- a/scripts/pi-hole/lua/sidebar.lp
+++ b/scripts/pi-hole/lua/sidebar.lp
@@ -27,13 +27,13 @@
             <ul class="sidebar-menu" data-widget="tree">
                 <li class="header text-uppercase">Main</li>
                 <!-- Home Page -->
-                <li class="menu-main<? if scriptname == 'index.lp' then mg.write(" active") end ?>">
+                <li class="menu-main<? if scriptname == 'index.lp' then ?> active<? end ?>">
                     <a href="index.lp">
                         <i class="fa fa-fw menu-icon fa-home"></i> <span>Dashboard</span>
                     </a>
                 </li>
                 <!-- Query Log -->
-                <li class="menu-analysis<? if scriptname == 'queries.lp' then mg.write(" active") end ?>">
+                <li class="menu-analysis<? if scriptname == 'queries.lp' then ?> active<? end ?>">
                     <a href="queries.lp">
                         <i class="fa fa-fw menu-icon fa-file-alt"></i> <span>Query Log</span>
                     </a>
@@ -41,7 +41,7 @@
 
                 <li class="header text-uppercase">Group Management</li>
                 <!-- Group Management -->
-                <li class="menu-group<? if scriptname == 'groups.lp' then mg.write(" active") end ?>">
+                <li class="menu-group<? if scriptname == 'groups.lp' then ?> active<? end ?>">
                     <a href="groups.lp">
                         <i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups
                         <span class="pull-right-container">
@@ -49,7 +49,7 @@
                         </span>
                     </a>
                 </li>
-                <li class="menu-group<? if scriptname == 'groups-clients.lp' then mg.write(" active") end ?>">
+                <li class="menu-group<? if scriptname == 'groups-clients.lp' then ?> active<? end ?>">
                     <a href="groups-clients.lp">
                         <i class="fa fa-fw menu-icon fa-laptop"></i> <span>Clients
                         <span class="pull-right-container">
@@ -57,7 +57,7 @@
                         </span>
                     </a>
                 </li>
-                <li class="menu-group<? if scriptname == 'groups-domains.lp' then mg.write(" active") end ?>">
+                <li class="menu-group<? if scriptname == 'groups-domains.lp' then ?> active<? end ?>">
                     <a href="groups-domains.lp">
                         <i class="fa fa-fw menu-icon fa-list"></i> <span>Domains
                         <span class="pull-right-container">
@@ -66,7 +66,7 @@
                         </span>
                     </a>
                 </li>
-                <li class="menu-group<? if scriptname == 'groups-adlists.lp' then mg.write(" active") end ?>">
+                <li class="menu-group<? if scriptname == 'groups-adlists.lp' then ?> active<? end ?>">
                     <a href="groups-adlists.lp">
                         <i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Adlists
                         <span class="pull-right-container">
@@ -125,7 +125,7 @@
                 </li>
                 <li class="header text-uppercase">System</li>
                 <!-- Settings -->
-                <li class="menu-system treeview <? if startsWith(scriptname, 'settings-') then mg.write(" active") end ?>">
+                <li class="menu-system treeview <? if startsWith(scriptname, 'settings-') then ?> active<? end ?>">
                     <a href="#">
                         <i class="fa fa-fw menu-icon fa-cogs"></i> <span>Settings</span>
                         <span class="pull-right-container">
@@ -133,42 +133,42 @@
                         </span>
                     </a>
                     <ul class="treeview-menu">
-                        <li class="<? if scriptname == 'settings-system.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'settings-system.lp' then ?> active<? end ?>">
                             <a href="settings-system.lp">
                                 <i class="fa-fw menu-icon fa-solid fa-circle-info"></i> <span>System</span>
                             </a>
                         </li>
-                        <li class="<? if scriptname == 'settings-dns.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'settings-dns.lp' then ?> active<? end ?>">
                             <a href="settings-dns.lp">
                                 <i class="fa-fw menu-icon fa-solid fa-book-atlas"></i> <span>DNS</span>
                             </a>
                         </li>
-                        <li class="<? if scriptname == 'settings-dhcp.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'settings-dhcp.lp' then ?> active<? end ?>">
                             <a href="settings-dhcp.lp">
                                 <i class="fa-fw menu-icon fa-solid fa-sitemap"></i> <span>DHCP</span>
                             </a>
                         </li>
-                        <li class="<? if scriptname == 'settings-api.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'settings-api.lp' then ?> active<? end ?>">
                             <a href="settings-api.lp">
                                 <i class="fa-fw menu-icon fa-solid fa-window-restore"></i> <span>Web interface / API</span>
                             </a>
                         </li>
-                        <li class="<? if scriptname == 'settings-privacy.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'settings-privacy.lp' then ?> active<? end ?>">
                             <a href="settings-privacy.lp">
                                 <i class="fa-fw menu-icon fa-solid fa-binoculars"></i> <span>Privacy</span>
                             </a>
                         </li>
-                        <li class="<? if scriptname == 'settings-advanced.lp' then mg.write(" active") end ?> settings-level-2">
+                        <li class="<? if scriptname == 'settings-advanced.lp' then ?> active<? end ?> settings-level-2">
                             <a href="settings-advanced.lp">
                                 <i class="fa-fw menu-icon fa-solid fa-pen-to-square"></i> <span>Advanced</span>
                             </a>
                         </li>
-                        <li class="<? if scriptname == 'settings-teleporter.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'settings-teleporter.lp' then ?> active<? end ?>">
                             <a href="settings-teleporter.lp">
                                 <i class="fa-fw menu-icon fa-solid fa-file-export"></i> <span>Teleporter</span>
                             </a>
                         </li>
-                        <li class="<? if scriptname == 'settings-dns-records.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'settings-dns-records.lp' then ?> active<? end ?>">
                             <a href="settings-dns-records.lp">
                                 <i class="fa-fw menu-icon fa-solid fa-address-book"></i> <span>Local DNS Records</span>
                             </a>
@@ -176,7 +176,7 @@
                     </ul>
                 </li>
                 <!-- Tools -->
-                <li class="menu-system treeview<? if in_array(scriptname, {'messages.lp', 'gravity.lp', 'search.lp', 'taillog.lp', 'network.lp'}) then mg.write(" active") end ?>">
+                <li class="menu-system treeview<? if in_array(scriptname, {'messages.lp', 'gravity.lp', 'search.lp', 'taillog.lp', 'network.lp'}) then ?> active<? end ?>">
                     <a href="#">
                         <i class="fa fa-fw menu-icon fa-tools"></i> <span>Tools</span>
                         <span class="warning-count hidden"></span>
@@ -186,14 +186,14 @@
                     </a>
                     <ul class="treeview-menu">
                         <!-- Pi-hole diagnosis -->
-                        <li class="<? if scriptname == 'messages.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'messages.lp' then ?> active<? end ?>">
                             <a href="messages.lp">
                                 <i class="fa fa-fw menu-icon fa-file-medical-alt"></i> <span>Pi-hole diagnosis</span>
                                 <span class="pull-right-container warning-count hidden"></span>
                             </a>
                         </li>
                         <!-- Tail log files -->
-                        <li class="treeview <? if scriptname == 'taillog.lp' then mg.write(" active") end ?>">
+                        <li class="treeview <? if scriptname == 'taillog.lp' then ?> active<? end ?>">
                             <a href="#">
                                 <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> <span>Tail log files</span>
                                 <span class="pull-right-container">
@@ -202,19 +202,19 @@
                             </a>
                             <ul class="treeview-menu">
                                 <!-- Tail pihole.log -->
-                                <li class="<? if scriptname == 'taillog.lp' and GET("file") == "dnsmasq" then mg.write(" active") end ?>">
+                                <li class="<? if scriptname == 'taillog.lp' and GET("file") == "dnsmasq" then ?> active<? end ?>">
                                     <a href="taillog.lp?file=dnsmasq">
                                         <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> <code>pihole.log</code>
                                     </a>
                                 </li>
                                 <!-- Tail FTL.log -->
-                                <li class="<? if scriptname == 'taillog.lp' and GET("file") == "ftl" then mg.write(" active") end ?>">
+                                <li class="<? if scriptname == 'taillog.lp' and GET("file") == "ftl" then ?> active<? end ?>">
                                     <a href="taillog.lp?file=ftl">
                                         <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> <code>FTL.log</code>
                                     </a>
                                 </li>
                                 <!-- Tail webserver.log -->
-                                <li class="<? if scriptname == 'taillog.lp' and GET("file") == "webserver" then mg.write(" active") end ?>">
+                                <li class="<? if scriptname == 'taillog.lp' and GET("file") == "webserver" then ?> active<? end ?>">
                                     <a href="taillog.lp?file=webserver">
                                         <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> <code>webserver.log</code>
                                     </a>
@@ -222,19 +222,19 @@
                             </ul>
                         </li>
                         <!-- Run gravity.sh -->
-                        <li class="<? if scriptname == 'gravity.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'gravity.lp' then ?> active<? end ?>">
                             <a href="gravity.lp">
                                 <i class="fa fa-fw menu-icon fa-arrow-circle-down"></i> <span>Update Gravity</span>
                             </a>
                         </li>
                         <!-- Query Lists -->
-                        <li class="<? if scriptname == 'search.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'search.lp' then ?> active<? end ?>">
                             <a href="search.lp">
                                 <i class="fa fa-fw menu-icon fa-search"></i> <span>Search Adlists</span>
                             </a>
                         </li>
                         <!-- Network -->
-                        <li class="<? if scriptname == 'network.lp' then mg.write(" active") end ?>">
+                        <li class="<? if scriptname == 'network.lp' then ?> active<? end ?>">
                             <a href="network.lp">
                                 <i class="fa fa-fw menu-icon fa-network-wired"></i> <span>Network</span>
                             </a>
diff --git a/settings-api.lp b/settings-api.lp
index 99e44559..c3010817 100644
--- a/settings-api.lp
+++ b/settings-api.lp
@@ -40,12 +40,12 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
                 <div class="row">
                     <div class="col-lg-12">
                         <div>
-                            <input type="checkbox" name="querylog-permitted" id="querylog-permitted" <? if queryLog == 'permittedonly' or queryLog == 'all' then mg.write("checked") end ?>>
+                            <input type="checkbox" name="querylog-permitted" id="querylog-permitted" <? if queryLog == 'permittedonly' or queryLog == 'all' then ?>checked<? end ?>>
                             <label for="querylog-permitted"><strong>Show permitted domain entries</strong></label>
                             <p class="help-block"><span class="text-red">This will show all permitted domain entries in the query log.</span></p>
                         </div>
                         <div>
-                            <input type="checkbox" name="querylog-blocked" id="querylog-blocked" <? if queryLog == 'blockedonly' or queryLog == 'all' then mg.write("checked") end ?>>
+                            <input type="checkbox" name="querylog-blocked" id="querylog-blocked" <? if queryLog == 'blockedonly' or queryLog == 'all' then ?>checked<? end ?>>
                             <label for="querylog-blocked"><strong>Show blocked domain entries</strong></label>
                             <p class="help-block"><span class="text-red">This will show all blocked domain entries in the query log.</span></p>
                         </div>
