From e08dff202f6b2fa05f2108f54de57de8048503a9 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Mon, 1 Apr 2019 17:10:59 -0400
Subject: [PATCH] use shell_exec on generate

---
 includes/functions.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index a87dab2..87a839e 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -612,14 +612,16 @@ function SaveTORAndVPNConfig(){
     </div>
     <?php
   } elseif( isset($_POST['GenerateLokinet']) ) {
-    exec( 'sudo /home/pi/loki-network/lokilaunch.sh "gen" > /dev/null &', $return);
+    $output = shell_exec( 'sudo /home/pi/loki-network/lokilaunch.sh "gen" > /dev/null &', $return);
+    echo "<pre>$output</pre>";
     ?>
     <div class="alert alert-warning">
       Generating Lokinet Configuration
     </div>
     <?php
   } elseif( isset($_POST['ReGenerateLokinet']) ) {
-    exec( 'sudo /home/pi/loki-network/lokilaunch.sh "gen" > /dev/null &', $return);
+    $output = shell_exec( 'sudo /home/pi/loki-network/lokilaunch.sh "gen" > /dev/null &', $return);
+    echo "<pre>$output</pre>";
     ?>
     <div class="alert alert-warning">
       Regenerating Lokinet Configuration
@@ -637,7 +639,7 @@ function SaveTORAndVPNConfig(){
   $bootstrap=htmlspecialchars($bootstrap);
   //$bootstrap = escapeshellarg($bootstrap);
   echo 'sudo /home/pi/loki-network/./lokilaunch.sh bootstrap '.$bootstrap.'';
-  $output = shell_exec('sudo /home/pi/./loki-network/lokilaunch.sh bootstrap '.$bootstrap.'');
+  $output = shell_exec('sudo /home/pi/./loki-network/lokilaunch.sh Bootstrap '.$bootstrap.'');
   echo "<pre>$output</pre>";
 
 }