From 0be196d708e76bb026320cc4a826280c0d1238ee Mon Sep 17 00:00:00 2001 From: Lawrence Date: Wed, 4 Oct 2017 01:06:47 +0800 Subject: [PATCH 1/4] Updated version numbers. Fixed up Sudoers file to include latest ip commands. --- index.php | 4 ++-- installers/common.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 37bd705e..ac9af9f8 100755 --- a/index.php +++ b/index.php @@ -13,7 +13,7 @@ * @author Lawrence Yau * @author Bill Zimmerman * @license GNU General Public License, version 3 (GPL-3.0) - * @version 1.1 + * @version 1.2.1 * @link https://github.com/billz/raspap-webgui * @see http://sirlagz.net/2013/02/08/raspap-webgui/ */ @@ -117,7 +117,7 @@ $csrf_token = $_SESSION['csrf_token']; - RaspAP Wifi Portal v1.1 + RaspAP Wifi Portal v1.2.1 diff --git a/installers/common.sh b/installers/common.sh index 6b07e9a3..d21a753b 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -183,6 +183,8 @@ function patch_system_files() { '/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf' '/sbin/shutdown -h now' '/sbin/reboot' + '/sbin/ip link set wlan0 down' + '/sbin/ip link set wlan0 up' ) # Check if sudoers needs patchin From 56c9fccda71ceb83b854a21694514a7585e9c883 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 3 Oct 2017 17:22:48 +0000 Subject: [PATCH 2/4] Fixed style class for rescan btn --- includes/configure_client.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/configure_client.php b/includes/configure_client.php index 334c95ea..4b1ede62 100755 --- a/includes/configure_client.php +++ b/includes/configure_client.php @@ -151,7 +151,7 @@ function DisplayWPAConfig(){

showMessages(); ?>

Client settings

- Rescan + Rescan
From 1fc061545275d1372b589946439ddd31a7e0fc41 Mon Sep 17 00:00:00 2001 From: Lawrence Date: Wed, 4 Oct 2017 01:28:57 +0800 Subject: [PATCH 3/4] Updated install script with new sudoers lines required. Updated uninstall script to resolve lighttpd directory contents not being removed Updated dashboard.php file to remove IP addresses when taking wlan0 down. --- includes/dashboard.php | 1 + installers/common.sh | 1 + installers/uninstall.sh | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/dashboard.php b/includes/dashboard.php index eb090a94..1f66542a 100755 --- a/includes/dashboard.php +++ b/includes/dashboard.php @@ -68,6 +68,7 @@ function DisplayDashboard(){ exec( 'ifconfig wlan0 | grep -i running | wc -l',$test ); if($test[0] == 0) { exec( 'sudo ip link set wlan0 up',$return ); + exec( 'sudo ip -s a f label wlan0',$return); } else { echo 'Interface already up'; } diff --git a/installers/common.sh b/installers/common.sh index d21a753b..93e82b54 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -185,6 +185,7 @@ function patch_system_files() { '/sbin/reboot' '/sbin/ip link set wlan0 down' '/sbin/ip link set wlan0 up' + '/sbin/ip -s a f label wlan0' ) # Check if sudoers needs patchin diff --git a/installers/uninstall.sh b/installers/uninstall.sh index 6e2dd658..b63ab2f0 100644 --- a/installers/uninstall.sh +++ b/installers/uninstall.sh @@ -81,7 +81,7 @@ function remove_raspap_directories() { install_error "RaspAP Installation directory not found. Exiting!" fi - sudo rm -rf "$webroot_dir/*" + sudo rm -rf "$webroot_dir"/* sudo rm -rf "$raspap_dir" } From ecdf34467b420913d1e1f019d01a89ac17b9d55d Mon Sep 17 00:00:00 2001 From: Lawrence Date: Wed, 4 Oct 2017 01:34:44 +0800 Subject: [PATCH 4/4] Updating version and sudoers --- index.php | 6 +++--- installers/common.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 37bd705e..d5cb80bd 100755 --- a/index.php +++ b/index.php @@ -13,7 +13,7 @@ * @author Lawrence Yau * @author Bill Zimmerman * @license GNU General Public License, version 3 (GPL-3.0) - * @version 1.1 + * @version 1.2.2 * @link https://github.com/billz/raspap-webgui * @see http://sirlagz.net/2013/02/08/raspap-webgui/ */ @@ -117,7 +117,7 @@ $csrf_token = $_SESSION['csrf_token']; - RaspAP Wifi Portal v1.1 + RaspAP Wifi Portal v1.2.2 @@ -135,7 +135,7 @@ $csrf_token = $_SESSION['csrf_token']; Configure hotspot
  • - Configure DHCP + Configure DHCP Server
  • diff --git a/installers/common.sh b/installers/common.sh index 6b07e9a3..93e82b54 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -183,6 +183,9 @@ function patch_system_files() { '/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf' '/sbin/shutdown -h now' '/sbin/reboot' + '/sbin/ip link set wlan0 down' + '/sbin/ip link set wlan0 up' + '/sbin/ip -s a f label wlan0' ) # Check if sudoers needs patchin