Merge branch 'master' of https://github.com/SirLagz/raspap-webgui

includes/configure_client.php

@@ -151,7 +151,7 @@ function DisplayWPAConfig(){
           <p><?php $status->showMessages(); ?></p>
           <h4>Client settings</h4>
 	<div class="btn-group btn-block">
-	<a href=".?<?php echo $_SERVER['QUERY_STRING']; ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-6-btn btn-info" id="update">Rescan</a>
+	<a href=".?<?php echo $_SERVER['QUERY_STRING']; ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info" id="update">Rescan</a>
 	</div>
           <form method="POST" action="?page=wpa_conf" name="wpa_conf_form">
             <?php CSRFToken() ?>

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';
     }

index.php

@@ -13,7 +13,7 @@
  * @author     Lawrence Yau <sirlagz@gmail.com>
  * @author     Bill Zimmerman <billzimmerman@gmail.com>
  * @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'];
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="index.php">RaspAP Wifi Portal v1.1</a>
+          <a class="navbar-brand" href="index.php">RaspAP Wifi Portal v1.2.2</a>
         </div>
         <!-- /.navbar-header -->
 
@@ -135,7 +135,7 @@ $csrf_token = $_SESSION['csrf_token'];
                 <a href="index.php?page=hostapd_conf"><i class="fa fa-dot-circle-o fa-fw"></i> Configure hotspot</a>
               </li>
               <li>
-                <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> Configure DHCP</a>
+                <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> Configure DHCP Server</a>
               </li>
               <?php if ( RASPI_OPENVPN_ENABLED ) : ?>
               <li>

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

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"
 
 }