From 31879298a03539ce45afb86a8ea50958bd8d4659 Mon Sep 17 00:00:00 2001
From: glen <glen@debian.home>
Date: Tue, 20 Oct 2020 18:06:16 -0400
Subject: [PATCH] Update to v2.0 includes WHOIS support

---
 README.md              |  2 +-
 config/lokilaunch.sh   |  5 ++++
 includes/config.php    |  2 +-
 includes/functions.php | 54 +++++++++++++++++++++++++++++++++++++++---
 index.php              |  2 +-
 5 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 82b5804..838dbd8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![](https://i.imgur.com/mXuacOH.jpg)
 
-# `$ Lokiap-webgui` [![Release 1.9](https://img.shields.io/badge/Release-1.9-green.svg)](https://github.com/necro-nemesis/raspap-webgui/releases)
+# `$ Lokiap-webgui` [![Release 2.0](https://img.shields.io/badge/Release-2.0-green.svg)](https://github.com/necro-nemesis/raspap-webgui/releases)
 
 LokiAP interfaces witht Lokinet daemon to facilitate connections to the Lokinet global privacy network. LokiAP provides a simple, responsive web interface to control wifi, hostapd, Lokinet daemon and related services necessary to access Lokinet on the Raspberry Pi or Orange Pi.
 
diff --git a/config/lokilaunch.sh b/config/lokilaunch.sh
index a3a3579..b480bde 100644
--- a/config/lokilaunch.sh
+++ b/config/lokilaunch.sh
@@ -47,6 +47,11 @@ exitdown)
         lokinet-vpn --down
         ;;
 
+whois)
+        echo -n "LNS Registration Information\n\n"
+        whois -h public.loki.foundation "$2"
+        ;;
+
   *)
         echo "Usage: "$1" {start|stop|gen|bootstrap|exitup|exitdown}"
         exit 1
diff --git a/includes/config.php b/includes/config.php
index cf0e156..17da7f1 100755
--- a/includes/config.php
+++ b/includes/config.php
@@ -1,6 +1,6 @@
 <?php
 
-define('RASPI_VERSION', '1.9');
+define('RASPI_VERSION', '2.0');
 define('RASPI_CONFIG', '/etc/raspap');
 define('RASPI_CONFIG_NETWORKING',RASPI_CONFIG.'/networking');
 define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');
diff --git a/includes/functions.php b/includes/functions.php
index 104d024..aca6579 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -233,6 +233,10 @@ function DisplayLokinetConfig()
                 </li>
                 <li><a href="#daemon" data-toggle="tab">Daemon Settings</a>
                 </li>
+
+                <li><a href="#whois" data-toggle="tab">WHOIS</a>
+                </li>
+
                 </ul>
         <!-- Tab panes -->
                   <div class="tab-content">
@@ -260,6 +264,21 @@ function DisplayLokinetConfig()
     } ?><h5><?php echo _("Your development support is greatly appreciated | Loki 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 | Loki Address:"); ?></h5>
+    <h5><pre><?php echo _("LA8VDcoJgiv2bSiVqyaT6hJ67LXbnQGpf9Uk3zh9ikUKPJUWeYbgsd9gxQ5ptM2hQNSsCaRETQ3GM9FLDe7BGqcm4ve69bh"); ?></pre></h5>
+                  </div>
+
+
                     <div class="tab-pane fade" id="daemon">
                     <h4>Lokient Daemon</h4>
                       <div class="row">
@@ -320,10 +339,12 @@ function ActivateLokinetConfig()
     //START
     if (isset($_POST['StartDaemon'])) {
         exec('sudo /var/lib/lokinet/lokilaunch.sh start');
+	DisplayLokinetConfig();
 
     //STOP
     } elseif (isset($_POST['StopDaemon'])) {
         exec('sudo /var/lib/lokinet/lokilaunch.sh stop');
+	DisplayLokinetConfig();
 
     //START EXIT
     } elseif (isset($_POST['StartExit'])) {
@@ -335,12 +356,17 @@ function ActivateLokinetConfig()
         echo "<pre><strong>$output</strong></pre>";
         GLOBAL $exitstatus;
         $exitstatus = TRUE;
+        ?><form method="post"><?php
+        echo '<input type="submit" class="btn btn-success" name="Return" value="Return" />' , PHP_EOL;
+        echo "\n";
+        ?><form><br/><?php
 
     //STOP EXIT
     } elseif (isset($_POST['StopExit'])) {
         exec ('sudo /var/lib/lokinet/lokilaunch.sh exitdown');
         GLOBAL $exitstatus;
         $exitstatus = FALSE;
+	DisplayLokinetConfig();
 
     //GENERATE LOKINET.INI
     } elseif (isset($_POST['GenerateLokinet'])) {
@@ -351,6 +377,10 @@ function ActivateLokinetConfig()
     <?php
     $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh gen');
         echo "<pre><strong>$output</strong></pre>";
+        ?><form method="post"><?php
+        echo '<input type="submit" class="btn btn-success" name="Return" value="Return" />' , PHP_EOL;
+        echo "\n";
+        ?><form><br/><?php
 
     //REGENERATE LOKINET.INI
     } elseif (isset($_POST['ReGenerateLokinet'])) {
@@ -361,6 +391,10 @@ function ActivateLokinetConfig()
     <?php
     $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh gen');
         echo "<pre><strong>$output</strong></pre>";
+        ?><form method="post"><?php
+        echo '<input type="submit" class="btn btn-success" name="Return" value="Return" />' , PHP_EOL;
+        echo "\n";
+        ?><form><br/><?php
 
     //APPLY LOKINET-BOOTSTRAP
     } elseif (isset($_POST['ApplyLokinetSettings'])) {
@@ -369,8 +403,22 @@ function ActivateLokinetConfig()
         $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh bootstrap '.$bootstrap.'');
         $output = preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $output);
         echo "<pre><strong>$output</strong></pre>";
-    }
+        ?><form method="post"><?php
+        echo '<input type="submit" class="btn btn-success" name="Return" value="Return" />' , PHP_EOL;
+        echo "\n";
+        ?><form><br/><?php
+
+   //WHOIS
+    } elseif (isset($_POST['checkaddress'])) {
+    $address = $_POST['lokiaddress'];
+        $output = shell_exec('sudo /var/lib/lokinet/lokilaunch.sh whois '.$address.'');
+        echo "<pre><strong>$output</strong></pre>";
+	?><form method="post"><?php
+	echo '<input type="submit" class="btn btn-success" name="Return" value="Return" />' , PHP_EOL;
+	echo "\n";
+	?><form><br/><?php
+ } elseif (isset($_POST['Return'])) {
+
+DisplayLokinetConfig();	}
 
-    DisplayLokinetConfig();
 }
-?>
diff --git a/index.php b/index.php
index a43c2b6..a349773 100755
--- a/index.php
+++ b/index.php
@@ -12,7 +12,7 @@
  *
  * @author     TechnicalTumbleweed (Loki->Discord/Telegram)
  * @license    GNU General Public License, version 3 (GPL-3.0)
- * @version    1.9
+ * @version    2.0
  * @link       https://github.com/necro-nemesis/Lokiap-webgui
  */