Merge branch 'master' into feature/templates

README.md

@@ -1,5 +1,5 @@
 ![](https://i.imgur.com/xeKD93p.png)
-# `$ raspap-webgui` [![Release 1.5](https://img.shields.io/badge/Release-1.5.1-green.svg)](https://github.com/billz/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) 
+# `$ raspap-webgui` [![Release 1.6](https://img.shields.io/badge/Release-1.6-green.svg)](https://github.com/billz/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) 
 
 A simple, responsive web interface to control wifi, hostapd and related services on the Raspberry Pi.
 
@@ -7,11 +7,11 @@ This project was inspired by a [**blog post**](http://sirlagz.net/2013/02/06/scr
 
 We'd be curious to hear about how you use this with your own RPi-powered projects. Until then, here are some screenshots:
 
-![](https://i.imgur.com/lQ57jVg.png)
-![](https://i.imgur.com/jFDMEy6.png)
-![](https://i.imgur.com/ck0XS8P.png)
-![](https://i.imgur.com/Vaej8Xv.png)
-![](https://i.imgur.com/iNuMMip.png)
+![](https://i.imgur.com/xyAdop0.gif)
+![](https://i.imgur.com/T0vrSsA.gif)
+![](https://i.imgur.com/n7Ir2cS.gif)
+![](https://i.imgur.com/JdsNr9L.gif)
+![](https://i.imgur.com/cYFnTIl.gif)
 ## Contents
 
  - [Prerequisites](#prerequisites)

includes/config.php

@@ -1,6 +1,6 @@
 <?php
 
-define('RASPI_VERSION', '1.5.1');
+define('RASPI_VERSION', '1.6');
 define('RASPI_CONFIG', '/etc/raspap');
 define('RASPI_CONFIG_NETWORKING', RASPI_CONFIG.'/networking');
 define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');

includes/networking.php

@@ -16,6 +16,5 @@ function DisplayNetworkingConfig()
     foreach ($interfaces as $interface) {
         exec("ip a show $interface", $$interface);
     }
-
     echo renderTemplate("networking", compact("status", "interfaces"));
 }

index.php

@@ -4,16 +4,16 @@
  * Raspbian WiFi Configuration Portal
  *
  * Enables use of simple web interface rather than SSH to control wifi and hostapd on the Raspberry Pi.
- * Recommended distribution is Raspbian Server Edition. Specific instructions to install the supported software are
+ * Recommended distribution is Raspbian Buster Lite. Specific instructions to install the supported software are
  * in the README and original post by @SirLagz. For a quick run through, the packages required for the WebGUI are:
- * lighttpd (I have version 1.4.45 installed via apt)
- * php7-cgi (I have version 7.0.33-0+deb9u3 installed via apt)
- * along with their supporting packages, php7 will also need to be enabled.
+ * lighttpd (I have version 1.4.53 installed via apt)
+ * php-cgi (I have version 7.1.20-1+b2  installed via apt)
+ * along with their supporting packages, php7.1 will also need to be enabled.
  *
  * @author     Lawrence Yau <sirlagz@gmail.com>
  * @author     Bill Zimmerman <billzimmerman@gmail.com>
  * @license    GNU General Public License, version 3 (GPL-3.0)
- * @version    1.5.1
+ * @version    1.6
  * @link       https://github.com/billz/raspap-webgui
  * @see        http://sirlagz.net/2013/02/08/raspap-webgui/
  */
@@ -58,7 +58,7 @@ $theme_url = 'dist/css/'.htmlspecialchars($theme, ENT_QUOTES);
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title><?php echo _("Raspbian WiFi Configuration Portal"); ?></title>
+    <title><?php echo _("RaspAP WiFi Configuration Portal"); ?></title>
 
     <!-- Bootstrap Core CSS -->
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">

installers/enablelog.sh

@@ -1,2 +1,4 @@
 #!/bin/bash
 /bin/sed -i 's|#DAEMON_OPTS=""|DAEMON_OPTS=" -f /tmp/hostapd.log"|' /etc/default/hostapd
+touch /tmp/hostapd.log
+chmod o+r /tmp/hostapd.log