Skip to content

Commit

Permalink
Merge pull request #73 from xtr4nge/develop
Browse files Browse the repository at this point in the history
v2.1.2
  • Loading branch information
xtr4nge committed Dec 22, 2014
2 parents 64c1f4b + c2d2063 commit 76766b0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion FruityWifi/www/config/config.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?
$version="v2.1.1";
$version="v2.1.2";
$regex=1; // 1 (on) | 0 (off) >> web interface input validation.
$regex_extra=" _-.[]*"; // extra characters allowed (input validation).
$log_path="/usr/share/fruitywifi/logs";
Expand Down
4 changes: 2 additions & 2 deletions FruityWifi/www/login_check.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?
/*
Copyright (C) 2013 xtr4nge [_AT_] gmail.com
Copyright (C) 2013-2014 xtr4nge [_AT_] gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/
?>
<?
session_start();
Expand Down
4 changes: 2 additions & 2 deletions FruityWifi/www/logout.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?
/*
Copyright (C) 2013 xtr4nge [_AT_] gmail.com
Copyright (C) 2013-2014 xtr4nge [_AT_] gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/
?>
<?
session_start();
Expand Down
11 changes: 8 additions & 3 deletions FruityWifi/www/scripts/status_logs_install.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,22 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/
?>
<?
include "../login_check.php";
include "../config/config.php";
include "../functions.php";

$service = $_POST["service"];
$path = $_POST["path"];

$path = "/usr/share/fruitywifi/logs/install.txt";
$path = "$log_path/install.txt";

$exec = "tail -n 5 $path";
$exec = "cat $path";
exec("/usr/share/fruitywifi/bin/danger \"" . $exec . "\"", $output);
//exec("/usr/share/fruitywifi/bin/danger \"" . $exec . "\"", $output); //DEPRECATED
$output = exec_fruitywifi($exec);

for ($i=0; $i < count($output); $i++)
{
Expand Down
2 changes: 1 addition & 1 deletion FruityWifi/www/scripts/status_wireless.php
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@
$exec = "/usr/sbin/dnsmasq -C /usr/share/fruitywifi/conf/dnsmasq.conf";
exec_fruitywifi($exec);

//Verifies if mana-hostapd is installed
//Verifies if karma-hostapd is installed
if ($hostapd_secure == 1) {

if (file_exists("/usr/share/fruitywifi/www/modules/karma/includes/hostapd")) {
Expand Down

0 comments on commit 76766b0

Please sign in to comment.