From d2253debd34c2cea5cf2614b6908a6453f804c13 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Tue, 30 Apr 2019 22:25:45 -0400
Subject: [PATCH] beutify code

---
 includes/functions.php | 69 +++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 41 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index c8485b2..f3f7efd 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -359,6 +359,7 @@ function DisplayLokinetConfig()
         $status = '<div class="alert alert-success alert-dismissable">Successfully Connected to Lokinet
 					<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
     }
+
      ?>
 	<div class="row">
 	<div class="col-lg-12">
@@ -378,27 +379,16 @@ function DisplayLokinetConfig()
            		<p><?php echo $status; ?></p>
             	<div class="tab-pane fade in active" id="basic">
                 <button type="button" class="btn btn-info" data-toggle="collapse" data-target="#instruct">Instructions</button>
-  <div id="instruct" class="collapse">All 4 buttons below must be active (green) to connect to Lokinet. If there isn't a current lokinet.ini file found on the system the "Generate.ini" button will be red. The .ini file must be generated first by pressing the button. Similarly the absense of a valid bootstrap will be indicated by the red "Bootstrap" button. Applying a bootstrap by pressing the apply button without submitting a valid URL in the textbox area will apply the original default bootstrap in place of one being provided. Stopping the daemon also exits Lokinet. If you simply exit Lokinet the daemon is left running in the background. So in summary if necessary generate the .ini and bootstrap then you are able to connect to lokinet and the daemon will be started.
-</div>
-
-
-
-
-<form role="form" action="?page=save_hostapd_conf" method="POST">
+                <div id="instruct" class="collapse">All 4 buttons below must be active (green) to connect to Lokinet. If there isn't a current lokinet.ini file found on the system the "Generate.ini" button will be red. The .ini file must be generated first by pressing the button. Similarly the absense of a valid bootstrap will be indicated by the red "Bootstrap" button. Applying a bootstrap by pressing the apply button without submitting a valid URL in the textbox area will apply the original default bootstrap in place of one being provided. Stopping the daemon also exits Lokinet. If you simply exit Lokinet the daemon is left running in the background. So in summary if necessary generate the .ini and bootstrap then you are able to connect to lokinet and the daemon will be started.
+                </div>
+                <form role="form" action="?page=save_hostapd_conf" method="POST">
+                  <div class="row">
+                    <div class="form-group col-lg-12">
+                      <h5>Enter a valid bootstrap url below and apply to overwrite the current bootstrap:</h5>
+                        <label for="usr">Bootstrap url:</label>
+                        <input type="url" class="form-control" placeholder="http://206.81.100.174/n-st-5.signed" id="lokinetbootstrap" name="lokinetbootstrap">
+                  <?php
 
-  <div class="row">
-						<div class="form-group col-lg-12">
-
-                <h5>Enter a valid bootstrap url below and apply to overwrite the current bootstrap:</h5>
-                <!--  <form>
-                    <div class="row">
-                  <div class="form-group col -lg-6"> -->
-                      <label for="usr">Bootstrap url:</label>
-                      <input type="url" class="form-control" placeholder="http://206.81.100.174/n-st-5.signed" id="lokinetbootstrap" name="lokinetbootstrap">
-                <!--    </div>
-                  </div>
-                </form> -->
-          				<?php
                   if ($rulestate != "lokinet") {
                       echo '<input type="submit" class="btn btn-danger" name="UseLokinet" value="Use Lokinet" />' , PHP_EOL;
                   } else {
@@ -408,15 +398,17 @@ function DisplayLokinetConfig()
                       echo '<input type="submit" class="btn btn-danger" name="StartDaemon" value="Start Daemon" />' , PHP_EOL;
                   } else {
                       echo '<input type="submit" class="btn btn-success" name="StopDaemon" value="Stop Daemon" />' , PHP_EOL;
-                        }
+                  }
 
     $filename = '/usr/local/bin/lokinet.ini';
 
-    if (file_exists($filename)) {
-        echo '<input type="submit" class="btn btn-success" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
-    } else {
-        echo '<input type="submit" class="btn btn-danger" name="GenerateLokinet" value="Generate .ini" />' , PHP_EOL;
-    } ?>
+                  if (file_exists($filename)) {
+                    echo '<input type="submit" class="btn btn-success" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
+                  } else {
+                    echo '<input type="submit" class="btn btn-danger" name="GenerateLokinet" value="Generate .ini" />' , PHP_EOL;
+                  }
+                  ?>
+
                   <input type="submit" class="btn btn-success" name="ApplyLokinetSettings" value="Re-Bootstrap" />
                   <h5><?php echo _("Your development support is greatly appreciated | Loki Address:"); ?></h5>
                   <h5><pre><?php echo _("LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh"); ?></pre></h5>
@@ -429,21 +421,16 @@ function DisplayLokinetConfig()
                   <div class="col-lg-12">
                     <iframe src="includes/webconsole.php" class="webconsole"></iframe>
                   </div>
-            </form>
-
-
-</div>
-</div>
-</div>
-
-
-
-      			</div><!-- /.tab-content -->
-      		</div><!-- /.panel-body -->
-      		<div class="panel-footer">Contact Loki user groups for the latest bootstrap file location</div>
-          </div><!-- /.panel-primary -->
-      </div><!-- /.col-lg-12 -->
-    </div><!-- /.row -->
+                </form>
+              </div>
+            </div>
+          </div>
+        </div><!-- /.tab-content -->
+	     </div><!-- /.panel-body -->
+      <div class="panel-footer">Contact Loki user groups for the latest bootstrap file location</div>
+    </div><!-- /.panel-primary -->
+  </div><!-- /.col-lg-12 -->
+</div><!-- /.row -->
       <?php
 }