From a39639248b4f77ab2e3770212643ddcccd996c1e Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Mon, 1 Apr 2019 18:55:29 -0400
Subject: [PATCH] Formatting code

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

diff --git a/includes/functions.php b/includes/functions.php
index 1b9dc88..c65dffa 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -612,14 +612,14 @@ function SaveTORAndVPNConfig(){
     </div>
     <?php
   } elseif( isset($_POST['GenerateLokinet']) ) {
-    exec( 'sudo /home/pi/loki-network/lokilaunch.sh "gen" > /dev/null &', $return);
     ?>
     <div class="alert alert-warning">
       Generating Lokinet Configuration
     </div>
     <?php
+    $output = shell_exec('sudo /home/pi/loki-network/lokilaunch.sh gen');
+    echo "<pre><strong>$output</strong></pre>";
   } elseif( isset($_POST['ReGenerateLokinet']) ) {
-  //  exec( 'sudo /home/pi/loki-network/lokilaunch.sh "gen" > /dev/null &', $return);
     ?>
     <div class="alert alert-warning">
       Regenerating Lokinet Configuration
@@ -635,10 +635,8 @@ function SaveTORAndVPNConfig(){
     </div>
     <?php
   $bootstrap=str_replace("'", "", $bootstrap);
-  $bootstrap=htmlspecialchars($bootstrap);
   $output = shell_exec('sudo /home/pi/./loki-network/lokilaunch.sh bootstrap '.$bootstrap.'');
   echo "<pre><strong>$output</strong></pre>";
-
-}
+  }
 }
 ?>