From 659f9675eb275c2a1a1e7ff6ce1bc904b831776b Mon Sep 17 00:00:00 2001
From: Bill Zimmerman <billzimmerman@gmail.com>
Date: Sun, 26 Jan 2020 08:51:06 +0100
Subject: [PATCH 1/2] Update BACKERS.md

---
 BACKERS.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/BACKERS.md b/BACKERS.md
index 9e5c3ea3..4ffdd6ea 100644
--- a/BACKERS.md
+++ b/BACKERS.md
@@ -1,4 +1,4 @@
-# RaspAP Sponors 
+# Sponors 
 
 Development of RaspAP is made possible thanks to our awesome sponsors!
 You can join them by [becoming a sponsor](https://github.com/sponsors/billz).
@@ -10,3 +10,10 @@ You can join them by [becoming a sponsor](https://github.com/sponsors/billz).
 ### 🤖 Robot fuelers 
 
 ### ☕️  Coffee supporters 
+
+# Donors
+
+One-time donors are vital to the continued development of this project. Join them by pledging via [Beerpay](https://beerpay.io/billz/raspap-webgui) or [PayPal](https://paypal.me/billzgithub).
+
+### PayPal
+Ray E - "This project is awesome and just works; saved me and my client tons of work. Thank you!" - $20

From 96773ab447c74927e15d63bd46aaba653830cfc5 Mon Sep 17 00:00:00 2001
From: Bill Zimmerman <billzimmerman@gmail.com>
Date: Mon, 27 Jan 2020 07:39:16 +0100
Subject: [PATCH 2/2] Minor: fix indentation

---
 templates/dhcp.php | 313 +++++++++++++++++++++++----------------------
 1 file changed, 157 insertions(+), 156 deletions(-)

diff --git a/templates/dhcp.php b/templates/dhcp.php
index 20c20250..cee466cf 100755
--- a/templates/dhcp.php
+++ b/templates/dhcp.php
@@ -14,184 +14,185 @@
         </div>
       </div><!-- /.row -->
     </div><!-- /.card-header -->
-		<div class="card-body">
-		<?php $status->showMessages(); ?>
-		<form method="POST" action="?page=dhcpd_conf" class="js-dhcp-settings-form">
-		<?php echo CSRFTokenFieldTag() ?>
-		<!-- Nav tabs -->
-				<ul class="nav nav-tabs">
-						<li class="nav-item"><a class="nav-link active" href="#server-settings" data-toggle="tab"><?php echo _("Server settings"); ?></a></li>
-						<li class="nav-item"><a class="nav-link" href="#static-leases" data-toggle="tab"><?php echo _("Static Leases") ?></a></li>
-						<li class="nav-item"><a class="nav-link" href="#client-list" data-toggle="tab"><?php echo _("Client list"); ?></a></li>
-				</ul>
-		<!-- Tab panes -->
-		<div class="tab-content">
-		<div class="tab-pane active" id="server-settings">
-		<h4 class="mt-3">DHCP server settings</h4>
-		<div class="row">
-			<div class="form-group col-md-6">
-				<label for="code">Interface</label>
-				<select class="form-control" name="interface">
-				<?php foreach ($interfaces as $if) : ?>
-						<?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
-						<?php $selected  = $if === $conf['interface'] ? ' selected="selected"' : '' ?>
-					<option value="<?php echo $if_quoted ?>"<?php echo $selected ?>><?php echo $if_quoted ?></option>
-				<?php endforeach ?>
-				</select>
-			</div>
-		</div>
-		<div class="row">
-			<div class="form-group col-md-6">
-				<label for="code"><?php echo _("Starting IP Address"); ?></label>
-				<input type="text" class="form-control"name="RangeStart" value="<?php echo htmlspecialchars($RangeStart, ENT_QUOTES); ?>" />
-			</div>
-		</div>
+    <div class="card-body">
+    <?php $status->showMessages(); ?>
+    <form method="POST" action="?page=dhcpd_conf" class="js-dhcp-settings-form">
+    <?php echo CSRFTokenFieldTag() ?>
+    <!-- Nav tabs -->
+    <ul class="nav nav-tabs">
+      <li class="nav-item"><a class="nav-link active" href="#server-settings" data-toggle="tab"><?php echo _("Server settings"); ?></a></li>
+      <li class="nav-item"><a class="nav-link" href="#static-leases" data-toggle="tab"><?php echo _("Static Leases") ?></a></li>
+      <li class="nav-item"><a class="nav-link" href="#client-list" data-toggle="tab"><?php echo _("Client list"); ?></a></li>
+    </ul>
+    <!-- Tab panes -->
+    <div class="tab-content">
+    <div class="tab-pane active" id="server-settings">
+    <h4 class="mt-3">DHCP server settings</h4>
+    <div class="row">
+      <div class="form-group col-md-6">
+        <label for="code">Interface</label>
+        <select class="form-control" name="interface">
+        <?php foreach ($interfaces as $if) : ?>
+            <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
+            <?php $selected  = $if === $conf['interface'] ? ' selected="selected"' : '' ?>
+          <option value="<?php echo $if_quoted ?>"<?php echo $selected ?>><?php echo $if_quoted ?></option>
+        <?php endforeach ?>
+        </select>
+      </div>
+    </div>
+    <div class="row">
+      <div class="form-group col-md-6">
+        <label for="code"><?php echo _("Starting IP Address"); ?></label>
+        <input type="text" class="form-control"name="RangeStart" value="<?php echo htmlspecialchars($RangeStart, ENT_QUOTES); ?>" />
+      </div>
+    </div>
 
-		<div class="row">
-			<div class="form-group col-md-6">
-				<label for="code"><?php echo _("Ending IP Address"); ?></label>
-				<input type="text" class="form-control" name="RangeEnd" value="<?php echo htmlspecialchars($RangeEnd, ENT_QUOTES); ?>" />
-			</div>
-		</div>
+    <div class="row">
+      <div class="form-group col-md-6">
+        <label for="code"><?php echo _("Ending IP Address"); ?></label>
+        <input type="text" class="form-control" name="RangeEnd" value="<?php echo htmlspecialchars($RangeEnd, ENT_QUOTES); ?>" />
+      </div>
+    </div>
 
-		<div class="row">
-			<div class="form-group col-xs-3 col-sm-3">
-				<label for="code"><?php echo _("Lease Time"); ?></label>
-				<input type="text" class="form-control" name="RangeLeaseTime" value="<?php echo htmlspecialchars($arrRangeLeaseTime[1], ENT_QUOTES); ?>" />
-			</div>
-			<div class="col-xs-3 col-sm-3">
-				<label for="code"><?php echo _("Interval"); ?></label>
-				<select name="RangeLeaseTimeUnits" class="form-control" >
-					<option value="m"<?php echo $mselected; ?>><?php echo _("Minute(s)"); ?></option>
-					<option value="h"<?php echo $hselected; ?>><?php echo _("Hour(s)"); ?></option>
-					<option value="d"<?php echo $dselected; ?>><?php echo _("Day(s)"); ?></option>
-					<option value="infinite"<?php echo $infiniteselected; ?>><?php echo _("Infinite"); ?></option>
-				</select>
-			</div>
-		</div>
-		
-		<div class="row">
-			<div class="form-group col-md-6">
-				<label for="code"><?php echo _("DNS Server"); ?> 1</label>
-				<input type="text" class="form-control"name="DNS1" value="<?php echo htmlspecialchars($DNS1, ENT_QUOTES); ?>" />
-			</div>
-		</div>
+    <div class="row">
+      <div class="form-group col-xs-3 col-sm-3">
+        <label for="code"><?php echo _("Lease Time"); ?></label>
+        <input type="text" class="form-control" name="RangeLeaseTime" value="<?php echo htmlspecialchars($arrRangeLeaseTime[1], ENT_QUOTES); ?>" />
+      </div>
+      <div class="col-xs-3 col-sm-3">
+        <label for="code"><?php echo _("Interval"); ?></label>
+        <select name="RangeLeaseTimeUnits" class="form-control" >
+          <option value="m"<?php echo $mselected; ?>><?php echo _("Minute(s)"); ?></option>
+          <option value="h"<?php echo $hselected; ?>><?php echo _("Hour(s)"); ?></option>
+          <option value="d"<?php echo $dselected; ?>><?php echo _("Day(s)"); ?></option>
+          <option value="infinite"<?php echo $infiniteselected; ?>><?php echo _("Infinite"); ?></option>
+        </select>
+      </div>
+    </div>
+    
+    <div class="row">
+      <div class="form-group col-md-6">
+        <label for="code"><?php echo _("DNS Server"); ?> 1</label>
+        <input type="text" class="form-control"name="DNS1" value="<?php echo htmlspecialchars($DNS1, ENT_QUOTES); ?>" />
+      </div>
+    </div>
 
-		<div class="row">
-			<div class="form-group col-md-6">
-				<label for="code"><?php echo _("DNS Server"); ?> 2</label>
-				<input type="text" class="form-control" name="DNS2" value="<?php echo htmlspecialchars($DNS2, ENT_QUOTES); ?>" />
-			</div>
-		</div>
+    <div class="row">
+      <div class="form-group col-md-6">
+        <label for="code"><?php echo _("DNS Server"); ?> 2</label>
+        <input type="text" class="form-control" name="DNS2" value="<?php echo htmlspecialchars($DNS2, ENT_QUOTES); ?>" />
+      </div>
+    </div>
 
-		<?php if (!RASPI_MONITOR_ENABLED) : ?>
-				<input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" />
-				<?php if ($dnsmasq_state) : ?>
-					<input type="submit" class="btn btn-warning" value="<?php echo _("Stop dnsmasq") ?>" name="stopdhcpd" />
-				<?php else : ?>
-					<input type="submit" class="btn btn-success" value="<?php echo _("Start dnsmasq") ?>" name="startdhcpd" />
-				<?php endif ?>
-		<?php endif ?>
-		</div><!-- /.tab-pane -->
+    <?php if (!RASPI_MONITOR_ENABLED) : ?>
+        <input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" />
+        <?php if ($dnsmasq_state) : ?>
+          <input type="submit" class="btn btn-warning" value="<?php echo _("Stop dnsmasq") ?>" name="stopdhcpd" />
+        <?php else : ?>
+          <input type="submit" class="btn btn-success" value="<?php echo _("Start dnsmasq") ?>" name="startdhcpd" />
+        <?php endif ?>
+    <?php endif ?>
+    </div><!-- /.tab-pane -->
 
-		<div class="tab-pane fade" id="client-list">
-		<h4 class="mt-3 mb-3">Client list</h4>
-		<div class="row">
-		<div class="col-lg-12">
-			<div class="card">
-			<div class="card-header"><?php echo _("Active DHCP leases"); ?></div>
-			<!-- /.panel-heading -->
-			<div class="card-body">
-				<div class="table-responsive">
-					<table class="table table-hover">
-						<thead>
-							<tr>
-								<th><?php echo _("Expire time"); ?></th>
-								<th><?php echo _("MAC Address"); ?></th>
-								<th><?php echo _("IP Address"); ?></th>
-								<th><?php echo _("Host name"); ?></th>
-								<th><?php echo _("Client ID"); ?></th>
-							</tr>
-						</thead>
-						<tbody>
-						<?php foreach ($leases as $lease) : ?>
-								<?php foreach (explode(' ', $lease) as $prop) : ?>
-									<tr>
-									<?php foreach (explode(' ', $lease) as $prop) : ?>
-										<td><?php echo htmlspecialchars($prop, ENT_QUOTES) ?></td>
-									<?php endforeach ?> 
-								</tr>
-								<?php endforeach ?>
-						<?php endforeach ?>
-						</tbody>
-					</table>
-				</div><!-- /.table-responsive -->
-			</div><!-- /.card-body -->
+    <div class="tab-pane fade" id="client-list">
+    <h4 class="mt-3 mb-3">Client list</h4>
+    <div class="row">
+    <div class="col-lg-12">
+      <div class="card">
+      <div class="card-header"><?php echo _("Active DHCP leases"); ?></div>
+      <!-- /.panel-heading -->
+      <div class="card-body">
+        <div class="table-responsive">
+          <table class="table table-hover">
+            <thead>
+              <tr>
+                <th><?php echo _("Expire time"); ?></th>
+                <th><?php echo _("MAC Address"); ?></th>
+                <th><?php echo _("IP Address"); ?></th>
+                <th><?php echo _("Host name"); ?></th>
+                <th><?php echo _("Client ID"); ?></th>
+              </tr>
+            </thead>
+            <tbody>
+            <?php foreach ($leases as $lease) : ?>
+                <?php foreach (explode(' ', $lease) as $prop) : ?>
+                  <tr>
+                  <?php foreach (explode(' ', $lease) as $prop) : ?>
+                    <td><?php echo htmlspecialchars($prop, ENT_QUOTES) ?></td>
+                  <?php endforeach ?> 
+                </tr>
+                <?php endforeach ?>
+            <?php endforeach ?>
+            </tbody>
+          </table>
+        </div><!-- /.table-responsive -->
+      </div><!-- /.card-body -->
     </div><!-- /.card -->
   </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->
   </div><!-- /.tab-pane -->
 
   <div class="tab-pane fade" id="static-leases">
-      <div class="dhcp-static-leases js-dhcp-static-lease-container">
-          <?php foreach ($dhcpHost as $host) : ?>
-              <?php list($mac, $ip) = array_map("trim", explode(",", $host)); ?>
-          <div class="row dhcp-static-lease-row js-dhcp-static-lease-row">
+    <div class="dhcp-static-leases js-dhcp-static-lease-container">
+      <?php foreach ($dhcpHost as $host) : ?>
+          <?php list($mac, $ip) = array_map("trim", explode(",", $host)); ?>
+            <div class="row dhcp-static-lease-row js-dhcp-static-lease-row">
               <div class="col-md-5 col-xs-5">
-                  <input type="text" name="static_leases[mac][]" value="<?php echo htmlspecialchars($mac, ENT_QUOTES) ?>" placeholder="<?php echo _("MAC address") ?>" class="form-control">
-              </div>
-              <div class="col-md-5 col-xs-4">
+                <input type="text" name="static_leases[mac][]" value="<?php echo htmlspecialchars($mac, ENT_QUOTES) ?>" placeholder="<?php echo _("MAC address") ?>" class="form-control">
+                </div>
+                <div class="col-md-5 col-xs-4">
                   <input type="text" name="static_leases[ip][]" value="<?php echo htmlspecialchars($ip, ENT_QUOTES) ?>" placeholder="<?php echo _("IP address") ?>" class="form-control">
-              </div>
-              <div class="col-md-2 col-xs-3">
+                </div>
+                <div class="col-md-2 col-xs-3">
                   <button type="button" class="btn btn-danger js-remove-dhcp-static-lease"><?php echo _("Remove") ?></button>
-              </div>
-          </div>
-          <?php endforeach ?>
-      </div>
+                </div>
+            </div>
+      <?php endforeach ?>
+    </div>
 
-      <h4 class="mt-3 mb-3"><?php echo _("Add static DHCP lease") ?></h4>
-      <div class="row dhcp-static-lease-row js-new-dhcp-static-lease">
-          <div class="col-md-5 col-xs-5">
-              <input type="text" name="mac" value="" placeholder="<?php echo _("MAC address") ?>" class="form-control" autofocus="autofocus">
-          </div>
-          <div class="col-md-5 col-xs-4">
-              <input type="text" name="ip" value="" placeholder="<?php echo _("IP address") ?>" class="form-control">
-          </div>
-          <div class="col-md-2 col-xs-3">
-              <button type="button" class="btn btn-success js-add-dhcp-static-lease"><?php echo _("Add") ?></button>
-          </div>
+    <h4 class="mt-3 mb-3"><?php echo _("Add static DHCP lease") ?></h4>
+    <div class="row dhcp-static-lease-row js-new-dhcp-static-lease">
+      <div class="col-md-5 col-xs-5">
+        <input type="text" name="mac" value="" placeholder="<?php echo _("MAC address") ?>" class="form-control" autofocus="autofocus">
       </div>
+      <div class="col-md-5 col-xs-4">
+        <input type="text" name="ip" value="" placeholder="<?php echo _("IP address") ?>" class="form-control">
+      </div>
+      <div class="col-md-2 col-xs-3">
+        <button type="button" class="btn btn-success js-add-dhcp-static-lease"><?php echo _("Add") ?></button>
+      </div>
+    </div>
 
-      <template id="js-dhcp-static-lease-row">
-          <div class="row dhcp-static-lease-row js-dhcp-static-lease-row">
-              <div class="col-md-5 col-xs-5">
-                  <input type="text" name="static_leases[mac][]" value="{{ mac }}" placeholder="<?php echo _("MAC address") ?>" class="form-control">
-              </div>
-              <div class="col-md-5 col-xs-4">
-                  <input type="text" name="static_leases[ip][]" value="{{ ip }}" placeholder="<?php echo _("IP address") ?>" class="form-control">
-              </div>
-              <div class="col-md-2 col-xs-3">
-                  <button type="button" class="btn btn-warning js-remove-dhcp-static-lease"><?php echo _("Remove") ?></button>
-              </div>
-          </div>
-      </template>
-      <?php if (!RASPI_MONITOR_ENABLED) : ?>
-          <input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" />
-          <?php
-          if ($dnsmasq_state) {
-              echo '<input type="submit" class="btn btn-warning" value="' . _("Stop dnsmasq") . '" name="stopdhcpd" />';
-          } else {
-              echo'<input type="submit" class="btn btn-success" value="' .  _("Start dnsmasq") . '" name="startdhcpd" />';
-          }
-          ?>
-      <?php endif ?>
+    <template id="js-dhcp-static-lease-row">
+      <div class="row dhcp-static-lease-row js-dhcp-static-lease-row">
+        <div class="col-md-5 col-xs-5">
+          <input type="text" name="static_leases[mac][]" value="{{ mac }}" placeholder="<?php echo _("MAC address") ?>" class="form-control">
+        </div>
+        <div class="col-md-5 col-xs-4">
+          <input type="text" name="static_leases[ip][]" value="{{ ip }}" placeholder="<?php echo _("IP address") ?>" class="form-control">
+        </div>
+        <div class="col-md-2 col-xs-3">
+          <button type="button" class="btn btn-warning js-remove-dhcp-static-lease"><?php echo _("Remove") ?></button>
+        </div>
+      </div>
+    </template>
+
+    <?php if (!RASPI_MONITOR_ENABLED) : ?>
+        <input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" />
+        <?php
+        if ($dnsmasq_state) {
+            echo '<input type="submit" class="btn btn-warning" value="' . _("Stop dnsmasq") . '" name="stopdhcpd" />';
+        } else {
+            echo'<input type="submit" class="btn btn-success" value="' .  _("Start dnsmasq") . '" name="startdhcpd" />';
+        }
+        ?>
+    <?php endif ?>
   </div>
 
   </div><!-- /.tab-content -->
 </form>
 </div><!-- ./ card-body -->
 <div class="card-footer"> <?php echo _("Information provided by Dnsmasq"); ?></div>
-    </div><!-- /.card -->
+  </div><!-- /.card -->
 </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->