From 604b28130fd2e331a8c13b773239e0dcf0fa2fdf Mon Sep 17 00:00:00 2001
From: Lawrence <sirlagz@gmail.com>
Date: Thu, 2 Nov 2017 22:33:11 +0800
Subject: [PATCH] Updating to help troubleshoot #132

Added the scripts to disable and enable logging for hostapd
Updated sudoers to allow running scripts
---
 includes/hostapd.php     | 10 +++++++---
 installers/common.sh     | 11 +++++++++++
 installers/disablelog.sh |  3 +++
 installers/enablelog.sh  |  2 ++
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100755 installers/disablelog.sh
 create mode 100755 installers/enablelog.sh

diff --git a/includes/hostapd.php b/includes/hostapd.php
index 7ce31da5..b0f5e22f 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -456,18 +456,22 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
 
   // Check for Logging Checkbox
     $logEnable = 0;
+    echo "SOMETHING ".$arrHostapdConf['LogEnable'];
+    echo 'logenable set:'.$_POST['logEnable'];
     if($arrHostapdConf['LogEnable'] == 0) {
         if(isset($_POST['logEnable'])) {
             // Need code to enable logfile logging here
             $logEnable = 1;
-            exec('sudo /bin/sed -i "\'"\'s|#DAEMON_OPTS=""|DAEMON_OPTS=" -f /tmp/hostapd.log"|\'"\'" /etc/default/hostapd');
+            exec('sudo /etc/raspap/hostapd/enablelog.sh');
+        } else {
+            exec('sudo /etc/raspap/hostapd/disablelog.sh');
         }
     } else {
         if(isset($_POST['logEnable'])) {
             $logEnable = 1;
-            exec('sudo /bin/sed -i "\'"\'s|#DAEMON_OPTS=""|DAEMON_OPTS=" -f /tmp/hostapd.log"|\'"\'" /etc/default/hostapd');
+            exec('sudo /etc/raspap/hostapd/enablelog.sh');
         } else {
-            exec('sudo /bin/sed -i "\'"\'s|DAEMON_OPTS=" -f /tmp/hostapd.log"|#DAEMON_OPTS=""|\'"\'" /etc/default/hostapd');
+            exec('sudo /etc/raspap/hostapd/disablelog.sh');
         }
     }
     write_php_ini(["LogEnable" => $logEnable],'/etc/raspap/hostapd.ini');
diff --git a/installers/common.sh b/installers/common.sh
index 0e6e358c..60998e22 100755
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -105,6 +105,13 @@ function create_raspap_directories() {
 
 }
 
+# Generate logging enable/disable files for hostapd
+function create_logging_scripts() {
+    sudo mkdir /etc/raspap/hostapd
+    sudo mv /var/www/html/installers/*log.sh /etc/rasp/hostapd
+}
+
+
 # Fetches latest files from github to webroot
 function download_latest_files() {
     if [ -d "$webroot_dir" ]; then
@@ -194,6 +201,7 @@ function default_configuration() {
     done
 }
 
+
 # Add a single entry to the sudoers file
 function sudo_add() {
   sudo bash -c "echo \"www-data ALL=(ALL) NOPASSWD:$1\" | (EDITOR=\"tee -a\" visudo)" \
@@ -223,6 +231,8 @@ function patch_system_files() {
       '/sbin/ip link set wlan0 up'
       '/sbin/ip -s a f label wlan0'
       '/bin/cp /etc/raspap/networking/dhcpcd.conf /etc/dhcpcd.conf'
+      '/etc/raspap/hostapd/enablelog.sh'
+      '/etc/raspap/hostapd/disablelog.sh'
     )
 
     # Check if sudoers needs patchin
@@ -259,6 +269,7 @@ function install_raspap() {
     install_dependencies
     enable_php_lighttpd
     create_raspap_directories
+    create_logging_scripts
     check_for_old_configs
     download_latest_files
     change_file_ownership
diff --git a/installers/disablelog.sh b/installers/disablelog.sh
new file mode 100755
index 00000000..4272b88f
--- /dev/null
+++ b/installers/disablelog.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+/bin/sed -i 's|DAEMON_OPTS=" -f /tmp/hostapd.log"|#DAEMON_OPTS=""|' /etc/default/hostapd
+
diff --git a/installers/enablelog.sh b/installers/enablelog.sh
new file mode 100755
index 00000000..79f75546
--- /dev/null
+++ b/installers/enablelog.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+/bin/sed -i 's|#DAEMON_OPTS=""|DAEMON_OPTS=" -f /tmp/hostapd.log"|' /etc/default/hostapd