Merge pull request #72 from xtr4nge/develop

v2.1.1
xtr4nge · Dec 21, 2014 · 710b200 · 710b200
2 parents 6d160fb + cbc88e9
commit 710b200
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/FruityWifi/www/config/config.php b/FruityWifi/www/config/config.php
@@ -1,5 +1,5 @@
 <?
-$version="v2.1";
+$version="v2.1.1";
 $regex=1; // 1 (on) | 0 (off) >> web interface input validation.
 $regex_extra=" _-.[]*"; // extra characters allowed (input validation).
 $log_path="/usr/share/fruitywifi/logs";

diff --git a/FruityWifi/www/scripts/status_wireless.php b/FruityWifi/www/scripts/status_wireless.php
@@ -355,7 +355,7 @@
         //unmanaged-devices=mac:<realmac>;interface-name:wlan2
         //macchanger --show wlan0 |grep "Permanent"
 
-        $exec = "macchanger --show eth0 |grep 'Permanent'";
+        $exec = "macchanger --show $io_in_iface |grep 'Permanent'";
         //$output = exec_fruitywifi($exec);
         exec($exec, $output);
         $mac = explode(" ", $output[0]);
@@ -365,7 +365,7 @@
 
         $exec = "sed -i '/unmanaged/d' /etc/NetworkManager/NetworkManager.conf";
         exec_fruitywifi($exec);
-        $exec = "sed -i '/[keyfile]/d' /etc/NetworkManager/NetworkManager.conf";
+        $exec = "sed -i '/\[keyfile\]/d' /etc/NetworkManager/NetworkManager.conf";
         exec_fruitywifi($exec);
 
         if ($ispresent == "") {
@@ -427,7 +427,7 @@
 
                 $exec = "$bin_hostapd $mod_path/includes/conf/hostapd-secure.conf >> $mod_logs &";
             } else {
-                $exec = "/usr/sbin/hostapd -P /var/run/hostapd-phy0 -B /usr/share/FruityWifi/conf/hostapd-secure.conf";
+                $exec = "/usr/sbin/hostapd -P /var/run/hostapd-phy0 -B /usr/share/fruitywifi/conf/hostapd-secure.conf";
             }
 
         } else {
@@ -456,7 +456,7 @@
 
                 $exec = "$bin_hostapd $mod_path/includes/conf/hostapd.conf >> $mod_logs &";
             } else {
-                $exec = "/usr/sbin/hostapd -P /var/run/hostapd-phy0 -B /usr/share/FruityWifi/conf/hostapd.conf";
+                $exec = "/usr/sbin/hostapd -P /var/run/hostapd-phy0 -B /usr/share/fruitywifi/conf/hostapd.conf";
             }
 
         }
@@ -489,7 +489,7 @@
         // REMOVE lines from NetworkManager
         $exec = "sed -i '/unmanaged/d' /etc/NetworkManager/NetworkManager.conf";
         exec_fruitywifi($exec);
-        $exec = "sed -i '/[keyfile]/d' /etc/NetworkMxanager/NetworkManager.conf";
+        $exec = "sed -i '/\[keyfile\]/d' /etc/NetworkManager/NetworkManager.conf";
         exec_fruitywifi($exec);
 
         $exec = "$bin_killall hostapd";	
@@ -602,7 +602,7 @@
 
                 $exec = "$bin_hostapd $mod_path/includes/conf/hostapd-secure.conf >> $mod_logs &";
             } else {
-                $exec = "/usr/sbin/hostapd -P /var/run/hostapd-phy0 -B /usr/share/FruityWifi/conf/hostapd-secure.conf";
+                $exec = "/usr/sbin/hostapd -P /var/run/hostapd-phy0 -B /usr/share/fruitywifi/conf/hostapd-secure.conf";
             }
 
         } else {
@@ -631,7 +631,7 @@
 
                 $exec = "$bin_hostapd $mod_path/includes/conf/hostapd.conf >> $mod_logs &";
             } else {
-                $exec = "/usr/sbin/hostapd -P /var/run/hostapd-phy0 -B /usr/share/FruityWifi/conf/hostapd.conf";
+                $exec = "/usr/sbin/hostapd -P /var/run/hostapd-phy0 -B /usr/share/fruitywifi/conf/hostapd.conf";
             }
 
         }