From 97a3aa106b18ba4efcc5fb2996295cd0acf63164 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sat, 14 Sep 2019 09:25:34 -0400
Subject: [PATCH] Clean up bootstrap PHP.

---
 includes/functions.php | 68 +++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 47278fd..78d3f72 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -596,64 +596,70 @@ function SaveTORAndVPNConfig()
         foreach ($return as $line) {
             echo htmlspecialchars($line, ENT_QUOTES).'<br />' , PHP_EOL;
         }
+/* Lokinet script commands start HERE
+////
+//// LOKINET
+////
+//*/
+
+    //START
     } elseif (isset($_POST['StartDaemon'])) {
-        ?>
+    ?>
     <div class="alert alert-success">
-      Launching Lokinet.
+    Launching Lokinet.
     </div>
     <?php
     $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh start');
-    echo "<pre><strong>$output</strong></pre>";
+      echo "<pre><strong>$output</strong></pre>";
+
+    //STOP
     } elseif (isset($_POST['StopDaemon'])) {
-        ?>
+    ?>
     <div class="alert alert-danger">
-          Exiting Lokinet.
+    Exiting Lokinet.
     </div>
     <?php
     ?>
     <div class="alert alert-danger">
-      Stopping Lokinet background daemon process.
+    Stopping Lokinet background daemon process.
     </div>
     <?php
     $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh stop');
-    echo "<pre><strong>$output</strong></pre>";
+      echo "<pre><strong>$output</strong></pre>";
+
+    //GENERATE LOKINET.INI
     } elseif (isset($_POST['GenerateLokinet'])) {
-        ?>
+    ?>
     <div class="alert alert-success">
-      Generating Lokinet Configuration
+    Generating Lokinet Configuration
     </div>
     <?php
     $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh gen');
-        echo "<pre><strong>$output</strong></pre>";
+      echo "<pre><strong>$output</strong></pre>";
+
+    //REGENERATE LOKINET.INI
     } elseif (isset($_POST['ReGenerateLokinet'])) {
-        ?>
+    ?>
     <div class="alert alert-success">
-      Regenerating Lokinet Configuration
+    Regenerating Lokinet Configuration
     </div>
     <?php
     $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh gen');
-        echo "<pre><strong>$output</strong></pre>";
+      echo "<pre><strong>$output</strong></pre>";
+
+    //APPLY LOKINET-BOOTSTRAP
     } elseif (isset($_POST['ApplyLokinetSettings'])) {
-      ?>
-  <div class="alert alert-danger">
-        Exiting Lokinet.
-  </div>
-  <?php
-  ?>
-  <div class="alert alert-danger">
+    ?>
+    <div class="alert alert-danger">
     Stopping Lokinet background daemon process.
-  </div>
-  <?php
-  $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh stop');
-  echo "<pre><strong>$output</strong></pre>";
-        $bootstrap = $_POST['lokinetbootstrap'];
-  ?>
-  <div class="alert alert-success">
+    </div>
+    <div class="alert alert-success">
     Applying Bootstrap
-  </div>
-  <?php
-  $bootstrap=str_replace("'", "", $bootstrap);
-        $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh bootstrap '.$bootstrap.'');
+    </div>
+    <?php
+    $bootstrap = $_POST['lokinetbootstrap'];
+    $bootstrap=str_replace("'", "", $bootstrap);
+    $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh bootstrap '.$bootstrap.'');
         echo "<pre><strong>$output</strong></pre>";
     }
 }