From c5c174818cb70877175ecde74210c991526f9d3c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Mon, 1 Apr 2019 18:03:28 -0400
Subject: [PATCH] shell_exe regen

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

diff --git a/includes/functions.php b/includes/functions.php
index 1a52ad5..dd24bbd 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -619,12 +619,14 @@ function SaveTORAndVPNConfig(){
     </div>
     <?php
   } elseif( isset($_POST['ReGenerateLokinet']) ) {
-    exec( 'sudo /home/pi/loki-network/lokilaunch.sh "gen" > /dev/null &', $return);
+  //  exec( 'sudo /home/pi/loki-network/lokilaunch.sh "gen" > /dev/null &', $return);
     ?>
     <div class="alert alert-warning">
       Regenerating Lokinet Configuration
     </div>
     <?php
+    $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh gen');
+    echo "<pre>$output</pre>";
   } elseif( isset($_POST['ApplyLokinetSettings']) ) {
     $bootstrap = $_POST['lokinetbootstrap'];
     ?>
@@ -634,8 +636,6 @@ function SaveTORAndVPNConfig(){
     <?php
   $bootstrap=str_replace("'", "", $bootstrap);
   $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.'');
   echo "<pre>$output</pre>";