From 6cbda7c4ea2ddebdb3cdc3d8ad5a9c4663f66726 Mon Sep 17 00:00:00 2001
From: necro-nemsis <necro_nemesis@hotmail.com>
Date: Wed, 11 May 2022 18:06:53 -0400
Subject: [PATCH] clean up foramtting

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

diff --git a/includes/functions.php b/includes/functions.php
index 5199793..7e4ddc7 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -78,11 +78,11 @@ function get_string_between($string, $start, $end)
 function CSRFToken()
 {
     ?>
-<input id="csrf_token" type="hidden" name="csrf_token" value="<?php echo htmlspecialchars(
-    $_SESSION["csrf_token"],
+	<input id="csrf_token" type="hidden" name="csrf_token" value="<?php echo htmlspecialchars(
+    $_SESSION[" csrf_token "],
     ENT_QUOTES
 ); ?>" />
-<?php
+	<?php
 }
 
 /**
@@ -260,74 +260,73 @@ function DisplayLokinetConfig()
     );
     $lokiversion = exec("dpkg -s lokinet | grep '^Version:'", $output);
     ?>
-        <div class="row">
-          <div class="col-lg-12">
-            <div class="panel panel-primary">
-              <div class="panel-heading"><i class="fa fa-eye-slash fa-fw"></i> Configure Lokinet</div>
-        <!-- /.panel-heading -->
-                <div class="panel-body">
-        <!-- Nav tabs -->
-                  <ul class="nav nav-tabs">
-                <li class="active"><a href="#basic" data-toggle="tab">Exit Node Settings</a>
-                </li>
-                <li><a href="#Mobile" data-toggle="tab">Mobile APN</a>
-                </li>
-                <li><a href="#whois" data-toggle="tab">WHOIS</a>
-                </li>
-
-                </ul>
-        <!-- Tab panes -->
-	<div class="tab-content">
-	        <p><?php echo $status; ?></p>
-                <p><?php echo "Current Lokinet $lokiversion"; ?></p>
-                <div class="tab-pane fade in active" id="basic">
-                <form role="form" action="?page=save_hostapd_conf" method="POST">
-	        <h5>Enter Exit Node Data to activate:</h5>
-                <label for="exitaddress">Exit:</label>
-		<input type="text" class="form-control" list="exitaddresses" placeholder="enter exit address here" id="exitaddress" name="exitaddress" onchange="OnSelectionChange()">
-		<?php $api_url = 'https://my-json-server.typicode.com/necro-nemesis/exits-api/exits';
+		<div class="row">
+			<div class="col-lg-12">
+				<div class="panel panel-primary">
+					<div class="panel-heading"><i class="fa fa-eye-slash fa-fw"></i> Configure Lokinet</div>
+					<!-- /.panel-heading -->
+					<div class="panel-body">
+						<!-- Nav tabs -->
+						<ul class="nav nav-tabs">
+							<li class="active"><a href="#basic" data-toggle="tab">Exit Node Settings</a> </li>
+							<li><a href="#Mobile" data-toggle="tab">Mobile APN</a> </li>
+							<li><a href="#whois" data-toggle="tab">WHOIS</a> </li>
+						</ul>
+						<!-- Tab panes -->
+						<div class="tab-content">
+							<p>
+								<?php echo $status; ?>
+							</p>
+							<p>
+								<?php echo "Current Lokinet $lokiversion"; ?>
+							</p>
+							<div class="tab-pane fade in active" id="basic">
+								<form role="form" action="?page=save_hostapd_conf" method="POST">
+									<h5>Enter Exit Node Data to activate:</h5>
+									<label for="exitaddress">Exit:</label>
+									<input type="text" class="form-control" list="exitaddresses" placeholder="enter exit address here" id="exitaddress" name="exitaddress" onchange="OnSelectionChange()">
+									<?php $api_url = 'https://my-json-server.typicode.com/necro-nemesis/exits-api/exits';
 			// Read JSON file
 			$json_data = file_get_contents($api_url);
 			// Decode JSON data into PHP array
 			$response_data = json_decode($json_data,true);
 			?>
-				<datalist id="exitaddresses">
-				<?php foreach($response_data as $response){
+										<datalist id="exitaddresses">
+											<?php foreach($response_data as $response){
 					$listedexits = '<option value=\''.$response['exit'].'\'>';
 					echo $listedexits;
 					}
-   				?>
-				</datalist>
-
-	<script>
-		//JSON Authentication Token Handler
-		async function OnSelectionChange(){
-		var selection = document.getElementById("exitaddress").value;
-		const endpoint = 'https://my-json-server.typicode.com/necro-nemesis/exits-api/db';
-		const response = await fetch(endpoint);
-		const data = await response.json();
-			for (var i = 0; i < data['exits'].length; i++) {
-		    		if (data['exits'][i]['exit'] == selection) {
-				const { exit, auth, geo, rate } = data['exits'][i];
-				console.log('Exit name : ' + exit);
-				console.log('Exit token : '+ auth);
-				console.log('Exit location : ' + geo);
-				console.log('Exit rate : ' + rate);
-				console.log('Dropdown selection : ' + selection);
-				alert('EXIT NODE INFORMATION\r\rExit Address : ' + exit + '\rExit Location : ' + geo + '\rExit Autorization Key : ' + auth + '\rMonthly Rate : ' + rate);
-				document.getElementById("auth").value = auth;
-      			break;
-			}
-    		}
-	}
-	</script>
-
-
-                <label for="exitkey">Exit Key: (optional)</label>
-                <input type="text" class="form-control" id="auth" placeholder="optional exit authorization key" id="exitkey" name="exitkey">
-		<br/>
-		<input type="reset" class="btn btn-default" value="Clear">
-                <?php
+				?>
+										</datalist>
+										<script>
+										//JSON Authentication Token Handler
+										async function OnSelectionChange() {
+											var selection = document.getElementById("exitaddress").value;
+											const endpoint = 'https://my-json-server.typicode.com/necro-nemesis/exits-api/db';
+											const response = await fetch(endpoint);
+											const data = await response.json();
+											for(var i = 0; i < data['exits'].length; i++) {
+												if(data['exits'][i]['exit'] == selection) {
+													const {
+														exit, auth, geo, rate
+													} = data['exits'][i];
+													console.log('Exit name : ' + exit);
+													console.log('Exit token : ' + auth);
+													console.log('Exit location : ' + geo);
+													console.log('Exit rate : ' + rate);
+													console.log('Dropdown selection : ' + selection);
+													alert('EXIT NODE INFORMATION\r\rExit Address : ' + exit + '\rExit Location : ' + geo + '\rExit Autorization Key : ' + auth + '\rMonthly Rate : ' + rate);
+													document.getElementById("auth").value = auth;
+													break;
+												}
+											}
+										}
+										</script>
+										<label for="exitkey">Exit Key: (optional)</label>
+										<input type="text" class="form-control" id="auth" placeholder="optional exit authorization key" id="exitkey" name="exitkey">
+										<br/>
+										<input type="reset" class="btn btn-default" value="Clear">
+										<?php
                 if ($exitstatus != "no exits") {
                     echo '<input type="submit" class="btn btn-danger" name="StopExit" value="Stop Exit" />', PHP_EOL;
                 } else {
@@ -339,79 +338,57 @@ function DisplayLokinetConfig()
                     echo '<input type="submit" class="btn btn-danger" name="StopDaemon" value="Stop Daemon" />', PHP_EOL;
                 }
 		?>
-
-<!-- Trigger the modal with a button -->
-<button type="button" class="btn btn-default" data-toggle="modal" data-target="#myModal">About</button>
-
-<!-- Modal -->
-<div id="myModal" class="modal fade" role="dialog">
-  <div class="modal-dialog">
-   <div class="modal-dialog modal-lg">
-    <!-- Modal content-->
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal">&times;</button>
-        <h4 class="modal-title">About</h4>
-        <img class="img-responsive" src="img/about_img.png" >
-      </div>
-      <div class="modal-body">
-        <p>LabyrinthAP is open source software offered under GNU General Public License v3.0.
-	Ongoing development is reliant on voluntary financial support through donations to the project.
-	I hope that you find using LabyrithAP beneficial and also hope there's sufficient widespread support for it
-	to financially support it's future.  Seeing support for it will assist in continued improvements as well
-	as adapting it to future requirements.</p>
-	<p>LabyrinthAP was initially conceived to provide users with a platform agnostic way to connect
-	networked devices to Lokinet without the need to install and configure Lokinet applications on individual
-	systems.  From initial research on compiling Lokinet for ARM, it was demonstrated that it could be
-	feasibile to use SBC's to create access points which could encrypt, decrypt,
-	route and onion route traffic over Lokinet while managing dns requirements.  In addition it could provide a means
-	to select and connect to various exits located all around the globe.  Through utilizing various robust packages
-	and coding custom networking configurations LabyrinthAP utilizing Lokinet is able to achieve all this.</p>
-	<p>This early research and further development led to the current version of LabyrithAP which provides
-	a solution which is able to connect virtually any networked device to Lokinet without the device
-	needing to have Lokinet installed, configured or running the application natively.  The devices need only
-	to connect to LabyrinthAP and it will handle the rest of Lokinet's connection requirements.</p>
-	<p>If you wish to donate to this development the Oxen wallet for LabyrinthAP is:
-	LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh</p><p>
-	Additional information can be found on the github repo located at: https://github.com/necro-nemesis/LabyrinthAP.
-	Further discussions and  assistance with using Lokinet is provided on Session in the Lokinet open group.</p><p>
-	I hope that LabyrinthAP will continue to service your needs for gaining access to Lokinet.</p><p>Thank-you for using LabyrinthAP,</p>
-	<p>Technical Tumbleweed</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-      </div>
-    </div>
-   </div>
-  </div>
-</div>
-
-                <h5><?php echo "Your development support is greatly appreciated <br>Independent LabyrinthAP developer TechnicalTumbleweed's OXEN wallet address:"; ?></h5>
-    		<h5><pre><?php echo "LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh"; ?></pre></h5>
-	</div>
-
-	<div class="tab-pane fade" id="Mobile">
-              	<form role="form" action="?page=save_hostapd_conf" method="POST">
-              	<h5>Enter mobile provider apn:</h5>
-              	<label for="apn">Mobile Provider APN:</label>
-              	<input type="text" class="form-control" placeholder="enter apn address here" id="apn" name="apn">
-              	<br/>
-              	<?php echo '<input type="submit" class="btn btn-success" name="apnaddress" value="Set APN" />',
-		PHP_EOL; ?><h5><?php echo "Your development support is greatly appreciated <br>Independent LabyrinthAP developer TechnicalTumbleweed's OXEN wallet address:"; ?></h5>
-  		<h5><pre><?php echo "LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh"; ?></pre></h5>
-	</div>
-
-	<div class="tab-pane fade" id="whois">
-                <form role="form" action="?page=save_hostapd_conf" method="POST">
-	        <h5>Enter .loki Address:</h5>
-                <label for="lokiaddress">Loki Address:</label>
-                <input type="text" class="form-control" placeholder="enter lokinet address here" id="lokiaddress" name="lokiaddress">
-                <br/>
-                <?php echo '<input type="submit" class="btn btn-success" name="checkaddress" value="Submit" />',
-		PHP_EOL; ?><h5><?php echo "Your development support is greatly appreciated <br>Independent LabyrinthAP developer TechnicalTumbleweed's OXEN wallet address:"; ?></h5>
-                <h5><pre><?php echo "LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh"; ?></pre></h5>
-	</div></div>
-	<?php
+											<!-- Trigger the modal with a button -->
+											<button type="button" class="btn btn-default" data-toggle="modal" data-target="#myModal">About</button>
+											<!-- Modal -->
+											<div id="myModal" class="modal fade" role="dialog">
+												<div class="modal-dialog">
+													<div class="modal-dialog modal-lg">
+														<!-- Modal content-->
+														<div class="modal-content">
+															<div class="modal-header">
+																<button type="button" class="close" data-dismiss="modal">&times;</button>
+																<h4 class="modal-title">About</h4> <img class="img-responsive" src="img/about_img.png"> </div>
+															<div class="modal-body">
+																<p>LabyrinthAP is open source software offered under GNU General Public License v3.0. Ongoing development is reliant on voluntary financial support through donations to the project. I hope that you find using LabyrithAP beneficial and also hope there's sufficient widespread support for it to financially support it's future. Seeing support for it will assist in continued improvements as well as adapting it to future requirements.</p>
+																<p>LabyrinthAP was initially conceived to provide users with a platform agnostic way to connect networked devices to Lokinet without the need to install and configure Lokinet applications on individual systems. From initial research on compiling Lokinet for ARM, it was demonstrated that it could be feasibile to use SBC's to create access points which could encrypt, decrypt, route and onion route traffic over Lokinet while managing dns requirements. In addition it could provide a means to select and connect to various exits located all around the globe. Through utilizing various robust packages and coding custom networking configurations LabyrinthAP utilizing Lokinet is able to achieve all this.</p>
+																<p>This early research and further development led to the current version of LabyrithAP which provides a solution which is able to connect virtually any networked device to Lokinet without the device needing to have Lokinet installed, configured or running the application natively. The devices need only to connect to LabyrinthAP and it will handle the rest of Lokinet's connection requirements.</p>
+																<p>If you wish to donate to this development the Oxen wallet for LabyrinthAP is: LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh</p>
+																<p> Additional information can be found on the github repo located at: https://github.com/necro-nemesis/LabyrinthAP. Further discussions and assistance with using Lokinet is provided on Session in the Lokinet open group.</p>
+																<p> I hope that LabyrinthAP will continue to service your needs for gaining access to Lokinet.</p>
+																<p>Thank-you for using LabyrinthAP,</p>
+																<p>Technical Tumbleweed</p>
+															</div>
+															<div class="modal-footer">
+																<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+															</div>
+														</div>
+													</div>
+												</div>
+											</div>
+											<h5><?php echo "Your development support is greatly appreciated <br>Independent LabyrinthAP developer TechnicalTumbleweed's OXEN wallet address:"; ?></h5>
+											<h5><pre><?php echo "LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh"; ?></pre></h5> </div>
+							<div class="tab-pane fade" id="Mobile">
+								<form role="form" action="?page=save_hostapd_conf" method="POST">
+									<h5>Enter mobile provider apn:</h5>
+									<label for="apn">Mobile Provider APN:</label>
+									<input type="text" class="form-control" placeholder="enter apn address here" id="apn" name="apn">
+									<br/>
+									<?php echo '<input type="submit" class="btn btn-success" name="apnaddress" value="Set APN" />',
+		PHP_EOL; ?>
+										<h5><?php echo "Your development support is greatly appreciated <br>Independent LabyrinthAP developer TechnicalTumbleweed's OXEN wallet address:"; ?></h5>
+										<h5><pre><?php echo "LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh"; ?></pre></h5> </div>
+							<div class="tab-pane fade" id="whois">
+								<form role="form" action="?page=save_hostapd_conf" method="POST">
+									<h5>Enter .loki Address:</h5>
+									<label for="lokiaddress">Loki Address:</label>
+									<input type="text" class="form-control" placeholder="enter lokinet address here" id="lokiaddress" name="lokiaddress">
+									<br/>
+									<?php echo '<input type="submit" class="btn btn-success" name="checkaddress" value="Submit" />',
+		PHP_EOL; ?>
+										<h5><?php echo "Your development support is greatly appreciated <br>Independent LabyrinthAP developer TechnicalTumbleweed's OXEN wallet address:"; ?></h5>
+										<h5><pre><?php echo "LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh"; ?></pre></h5> </div>
+    <?php
 }
 
 function ActivateLokinetConfig()
@@ -448,19 +425,32 @@ function ActivateLokinetConfig()
         );
 	$exitstatus = exec("lokinet-vpn --status");
 	if ($exitstatus != "no exits") {
-	?><div class="alert alert-info"><?php
+	?>
+							<div class="alert alert-info">
+								<?php
 	echo "Exit Enabled";
-	?></div><?php
+	?>
+							</div>
+							<?php
 	} else {
-	?><div class="alert alert-danger"><?php
+	?>
+								<div class="alert alert-danger">
+									<?php
 	echo "WARNING EXIT DID NOT CONNECT";
-	?></div><?php
+	?>
+								</div>
+								<?php
 	}
         echo "<pre><strong>$output</strong></pre>";
-        ?><form method="post"><?php
+        ?>
+									<form method="post">
+										<?php
 	echo '<input type="submit" class="btn btn-success" name="Return" value="Return" />', PHP_EOL;
 	echo "\n";
-	?><form><br/><?php
+	?>
+											<form>
+												<br/>
+												<?php
 
         //STOP EXIT
     } elseif (isset($_POST["StopExit"])) {
@@ -472,10 +462,15 @@ function ActivateLokinetConfig()
         $address = $_POST["lokiaddress"];
         $output = shell_exec("sudo /var/lib/lokinet/lokilaunch.sh whois " . $address . "");
         echo "<pre><strong>$output</strong></pre>";
-        ?><form method="post"><?php
+        ?>
+													<form method="post">
+														<?php
 	echo '<input type="submit" class="btn btn-success" name="Return" value="Return" />', PHP_EOL;
 	echo "\n";
-	?><form><br/><?php
+	?>
+															<form>
+																<br/>
+																<?php
 
         //Mobile
     } elseif (isset($_POST["apnaddress"])) {
@@ -486,14 +481,19 @@ function ActivateLokinetConfig()
         $output = str_replace($parsed, $apnvalue, $input);
         file_put_contents($file, $output);
         echo "<pre><strong>Reboot required to start mobile. Reboot now?</strong></pre>";
-        ?><form method="post"><?php
+        ?>
+																	<form method="post">
+																		<?php
 	echo '<input type="submit" class="btn btn-success" name="Return" value="Reboot Later" />', PHP_EOL;
 	echo '<input type="submit" class="btn btn-success" name="Reboot" value="Activate Now" />', PHP_EOL;
 	echo "\n";
-	?><form><br/><?php
-    	} elseif (isset($_POST["Return"])) {
+	?>
+																			<form>
+																				<br/>
+																				<?php
+	} elseif (isset($_POST["Return"])) {
         DisplayLokinetConfig();
-    	} elseif (isset($_POST["Reboot"])) {
+	} elseif (isset($_POST["Reboot"])) {
         shell_exec("sudo reboot now");
-    	}
+	}
 }