From 79558f05092fa5286f3adba0d0be0bdd3d243c35 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 08:11:34 -0400
Subject: [PATCH 01/97] Add console to Lokinet tab
---
includes/functions.php | 98 ++++++++++++++----------------------------
1 file changed, 32 insertions(+), 66 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index a34bd55d1..84db3754b 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -262,7 +262,7 @@ function DisplayOpenVPNConfig() {
<h4>Server settings</h4>
<div class="row">
<div class="form-group col-md-4">
- <label for="code">Port</label>
+ <label for="code">Port</label>
<input type="text" class="form-control" name="openvpn_port" value="<?php echo htmlspecialchars($arrServerConfig['port'], ENT_QUOTES); ?>" />
</div>
</div>
@@ -350,14 +350,14 @@ function DisplayLokinetConfig(){
<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 TOR proxy</div>
+ <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">Basic</a>
</li>
- <li><a href="#relay" data-toggle="tab">Relay</a>
+ <li><a href="#daemon" data-toggle="tab">Lokinet Daemon Console</a>
</li>
</ul>
@@ -385,13 +385,13 @@ function DisplayLokinetConfig(){
<label for="code">AutomapHostsOnResolve</label>
<input type="text" class="form-control" name="automaphostsonresolve" value="<?php echo htmlspecialchars($arrConfig['AutomapHostsOnResolve'], ENT_QUOTES); ?>" />
</div>
- </div>
+ </div>
<div class="row">
<div class="form-group col-md-4">
<label for="code">TransListenAddress</label>
<input type="text" class="form-control" name="translistenaddress" value="<?php echo htmlspecialchars($arrConfig['TransListenAddress'], ENT_QUOTES); ?>" />
</div>
- </div>
+ </div>
<div class="row">
<div class="form-group col-md-4">
<label for="code">DNSPort</label>
@@ -405,62 +405,28 @@ function DisplayLokinetConfig(){
</div>
</div>
</div>
- <div class="tab-pane fade" id="relay">
- <h4>Relay settings</h4>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">ORPort</label>
- <input type="text" class="form-control" name="orport" value="<?php echo htmlspecialchars($arrConfig['ORPort'], ENT_QUOTES); ?>" />
- </div>
- </div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">ORListenAddress</label>
- <input type="text" class="form-control" name="orlistenaddress" value="<?php echo htmlspecialchars($arrConfig['ORListenAddress'], ENT_QUOTES); ?>" />
- </div>
- </div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">Nickname</label>
- <input type="text" class="form-control" name="nickname" value="<?php echo htmlspecialchars($arrConfig['Nickname'], ENT_QUOTES); ?>" />
- </div>
- </div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">Address</label>
- <input type="text" class="form-control" name="address" value="<?php echo htmlspecialchars($arrConfig['Address'], ENT_QUOTES); ?>" />
- </div>
- </div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">RelayBandwidthRate</label>
- <input type="text" class="form-control" name="relaybandwidthrate" value="<?php echo htmlspecialchars($arrConfig['RelayBandwidthRate'], ENT_QUOTES); ?>" />
- </div>
- </div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">RelayBandwidthBurst</label>
- <input type="text" class="form-control" name="relaybandwidthburst" value="<?php echo htmlspecialchars($arrConfig['RelayBandwidthBurst'], ENT_QUOTES); ?>" />
- </div>
- </div>
- </div>
-
- <input type="submit" class="btn btn-outline btn-primary" name="SaveTORProxySettings" value="Save settings" />
- <?php
- if( $torproxystatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start TOR" />' , PHP_EOL;
- } else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop TOR" />' , PHP_EOL;
- };
- ?>
- </form>
- </div><!-- /.tab-content -->
- </div><!-- /.panel-body -->
- <div class="panel-footer"> Information provided by tor</div>
- </div><!-- /.panel-primary -->
-</div><!-- /.col-lg-12 -->
-</div><!-- /.row -->
-<?php
+ <div class="tab-pane fade" id="daemon">
+ <h4>Lokient Daemon</h4>
+ <div class="row">
+ <div class="col-lg-12">
+ <iframe src="includes/webconsole.php" class="webconsole"></iframe>
+ </div>
+ </div>
+ </div>
+
+ </div><!-- /.systemtabcontent -->
+
+ </div><!-- /.panel-default -->
+ </div><!-- /.col-md-6 -->
+ </div><!-- /.row -->
+ </div><!-- /.panel-body -->
+ </form>
+ </div><!-- /.panel-primary -->
+ <div class="panel-footer"></div>
+ </div><!-- /.panel-primary -->
+ </div><!-- /.col-lg-12 -->
+ </div><!-- /.row -->
+<?php
}
/**
@@ -527,13 +493,13 @@ function DisplayTorProxyConfig(){
<label for="code">AutomapHostsOnResolve</label>
<input type="text" class="form-control" name="automaphostsonresolve" value="<?php echo htmlspecialchars($arrConfig['AutomapHostsOnResolve'], ENT_QUOTES); ?>" />
</div>
- </div>
+ </div>
<div class="row">
<div class="form-group col-md-4">
<label for="code">TransListenAddress</label>
<input type="text" class="form-control" name="translistenaddress" value="<?php echo htmlspecialchars($arrConfig['TransListenAddress'], ENT_QUOTES); ?>" />
</div>
- </div>
+ </div>
<div class="row">
<div class="form-group col-md-4">
<label for="code">DNSPort</label>
@@ -588,7 +554,7 @@ function DisplayTorProxyConfig(){
</div>
<input type="submit" class="btn btn-outline btn-primary" name="SaveTORProxySettings" value="Save settings" />
- <?php
+ <?php
if( $torproxystatus[0] == 0 ) {
echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start TOR" />' , PHP_EOL;
} else {
@@ -602,7 +568,7 @@ function DisplayTorProxyConfig(){
</div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 -->
</div><!-- /.row -->
-<?php
+<?php
}
/**
@@ -638,5 +604,5 @@ function SaveTORAndVPNConfig(){
foreach( $return as $line ) {
echo htmlspecialchars($line, ENT_QUOTES).'<br />' , PHP_EOL;
}
- }
+ }
}
From bcf6faae4bed4dea145ec12ebda333d30249576d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:06:27 -0400
Subject: [PATCH 02/97] Add youtube embed
---
includes/functions.php | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/includes/functions.php b/includes/functions.php
index 84db3754b..df4629e15 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -359,6 +359,8 @@ function DisplayLokinetConfig(){
</li>
<li><a href="#daemon" data-toggle="tab">Lokinet Daemon Console</a>
</li>
+ <li><a href="#youtube" data-toggle="tab">This is Loki</a>
+ </li>
</ul>
<!-- Tab panes -->
@@ -426,6 +428,13 @@ function DisplayLokinetConfig(){
</div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 -->
</div><!-- /.row -->
+ <div class="tab-pane fade" id="youtube">
+ <div class="container">
+ <h2>This is Loki</h2>
+ <div class="embed-responsive embed-responsive-16by9">
+ <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
+ </div>
+</div>
<?php
}
From 23297f3458ce4d69e02cf1e17e1a941e0f23858d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:11:24 -0400
Subject: [PATCH 03/97] More youtube embed
---
includes/functions.php | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/includes/functions.php b/includes/functions.php
index df4629e15..99ded56c9 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -430,6 +430,17 @@ function DisplayLokinetConfig(){
</div><!-- /.row -->
<div class="tab-pane fade" id="youtube">
<div class="container">
+ <!DOCTYPE html>
+ <html lang="en">
+ <head>
+ <title>Bootstrap Example</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+ </head>
+ <body>
<h2>This is Loki</h2>
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
From e712b865d17e4d9357eec6bf1053f2c5775170f2 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:13:39 -0400
Subject: [PATCH 04/97] More youtube embed
---
includes/functions.php | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/includes/functions.php b/includes/functions.php
index df4629e15..99ded56c9 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -430,6 +430,17 @@ function DisplayLokinetConfig(){
</div><!-- /.row -->
<div class="tab-pane fade" id="youtube">
<div class="container">
+ <!DOCTYPE html>
+ <html lang="en">
+ <head>
+ <title>Bootstrap Example</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
+ </head>
+ <body>
<h2>This is Loki</h2>
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
From cbf1a4dcb6d37669b2410ed6460d55538262d8a5 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:17:45 -0400
Subject: [PATCH 05/97] Remove blue
---
includes/functions.php | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 99ded56c9..df4629e15 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -430,17 +430,6 @@ function DisplayLokinetConfig(){
</div><!-- /.row -->
<div class="tab-pane fade" id="youtube">
<div class="container">
- <!DOCTYPE html>
- <html lang="en">
- <head>
- <title>Bootstrap Example</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js"></script>
- </head>
- <body>
<h2>This is Loki</h2>
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
From a35b93d48868ed1869ecc8eb392c8cac75b1018f Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:35:20 -0400
Subject: [PATCH 06/97] contain youtube
---
includes/functions.php | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index df4629e15..9e8d01362 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -407,7 +407,8 @@ function DisplayLokinetConfig(){
</div>
</div>
</div>
- <div class="tab-pane fade" id="daemon">
+
+ <div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
<div class="col-lg-12">
@@ -428,13 +429,19 @@ function DisplayLokinetConfig(){
</div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 -->
</div><!-- /.row -->
- <div class="tab-pane fade" id="youtube">
+
+ <div class="tab-pane fade" id="youtube">
<div class="container">
- <h2>This is Loki</h2>
- <div class="embed-responsive embed-responsive-16by9">
- <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
- </div>
-</div>
+ <h2>This is Loki</h2>
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="embed-responsive embed-responsive-16by9">
+ <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
<?php
}
From 3414b989bb82298cf4b614274f9b7e514f27213d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:40:44 -0400
Subject: [PATCH 07/97] row col first
---
includes/functions.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 9e8d01362..3ceb1f3bd 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -431,10 +431,10 @@ function DisplayLokinetConfig(){
</div><!-- /.row -->
<div class="tab-pane fade" id="youtube">
- <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="container">
<h2>This is Loki</h2>
- <div class="row">
- <div class="col-lg-12">
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
</div>
From 1775b2efd99dea32727cdb0598bc9b8ac2822c8d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:46:09 -0400
Subject: [PATCH 08/97] clean up code
---
includes/functions.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 3ceb1f3bd..0b4836e0a 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -435,8 +435,7 @@ function DisplayLokinetConfig(){
<div class="col-lg-12">
<div class="container">
<h2>This is Loki</h2>
- <div class="embed-responsive embed-responsive-16by9">
- <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
+ <iframe src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
</div>
</div>
</div>
From 27a91edc699d7686504d950f99971f030f9481d6 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:47:10 -0400
Subject: [PATCH 09/97] clean up code
---
includes/functions.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 3ceb1f3bd..0b4836e0a 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -435,8 +435,7 @@ function DisplayLokinetConfig(){
<div class="col-lg-12">
<div class="container">
<h2>This is Loki</h2>
- <div class="embed-responsive embed-responsive-16by9">
- <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
+ <iframe src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
</div>
</div>
</div>
From 4450beef7beb6bcdd1aec1af9f04316d2b5acedc Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:49:59 -0400
Subject: [PATCH 10/97] Remove container
---
includes/functions.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 0b4836e0a..9ec9ef8f7 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,9 +433,9 @@ function DisplayLokinetConfig(){
<div class="tab-pane fade" id="youtube">
<div class="row">
<div class="col-lg-12">
- <div class="container">
<h2>This is Loki</h2>
- <iframe src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
+ <div class="embed-responsive embed-responsive-16by9">
+ <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
</div>
</div>
</div>
From 6549378d6c4f72bd4d1543275b2d436b29248853 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:54:05 -0400
Subject: [PATCH 11/97] Swap col for container
---
includes/functions.php | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 9ec9ef8f7..4d18d242d 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -431,16 +431,13 @@ function DisplayLokinetConfig(){
</div><!-- /.row -->
<div class="tab-pane fade" id="youtube">
- <div class="row">
- <div class="col-lg-12">
+ <div class="container">
<h2>This is Loki</h2>
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
- </div>
- </div>
</div>
- </div>
</div>
+ </div>
<?php
}
From f9ed4d9a30a2b3e5f98ec20dc7298b1d78d9abe9 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 09:58:26 -0400
Subject: [PATCH 12/97] move
---
includes/functions.php | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 4d18d242d..6d9e13db7 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -417,6 +417,15 @@ function DisplayLokinetConfig(){
</div>
</div>
+ <div class="tab-pane fade" id="youtube">
+ <div class="container">
+ <h2>This is Loki</h2>
+ <div class="embed-responsive embed-responsive-16by9">
+ <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
+ </div>
+ </div>
+ </div>
+
</div><!-- /.systemtabcontent -->
</div><!-- /.panel-default -->
@@ -430,14 +439,7 @@ function DisplayLokinetConfig(){
</div><!-- /.col-lg-12 -->
</div><!-- /.row -->
- <div class="tab-pane fade" id="youtube">
- <div class="container">
- <h2>This is Loki</h2>
- <div class="embed-responsive embed-responsive-16by9">
- <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
- </div>
- </div>
- </div>
+
<?php
}
From fb597ecc663b7cfc429134bf2e71890a44528c0c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:16:29 -0400
Subject: [PATCH 13/97] Add Loki status to dashboard
---
includes/dashboard.php | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 2469f017b..e18db89e6 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -60,7 +60,7 @@ function DisplayDashboard(){
preg_match('/state (UP|DOWN)/i', $stdoutIpWRepeatedSpaces, $matchesState ) || $matchesState[1] = 'unknown';
$interfaceState = $matchesState[1];
- // Because of table layout used in the ip output we get the interface statistics directly from
+ // Because of table layout used in the ip output we get the interface statistics directly from
// the system. One advantage of this is that it could work when interface is disable.
exec('cat /sys/class/net/'.RASPI_WIFI_CLIENT_INTERFACE.'/statistics/rx_packets ', $stdoutCatRxPackets);
$strRxPackets = _('No data');
@@ -126,7 +126,7 @@ function DisplayDashboard(){
preg_match('/txpower ([0-9\.]+ dBm)/i', $stdoutIpInfoWRepSpaces, $matchesTxPower ) || $matchesTxPower[1] = '';
$txPower = $matchesTxPower[1];
- // iw does not have the "Link Quality". This is a is an aggregate value,
+ // iw does not have the "Link Quality". This is a is an aggregate value,
// and depends on the driver and hardware.
// Display link quality as signal quality for now.
$strLinkQuality = 0;
@@ -174,6 +174,15 @@ function DisplayDashboard(){
} else {
$status->addMessage(sprintf(_('Interface is %s.'), strtolower($interfaceState)), $classMsgDevicestatus);
}
+ exec( 'pidof lokinet | wc -l', $lokinetstatus);
+
+ if( $lokinetstatus[0] == 0 ) {
+ $status = '<div class="alert alert-warning alert-dismissable">Lokinet daemon is not running
+ <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
+ } else {
+ $status = '<div class="alert alert-success alert-dismissable">Lokinet is running
+ <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
+ }
?>
<div class="row">
<div class="col-lg-12">
@@ -274,4 +283,3 @@ function getHumanReadableDatasize($numbytes, $precision = 2)
return $humanDatasize;
}
-
From b577847f9b74e0df82ba9f3474e5445e2d77365f Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:20:36 -0400
Subject: [PATCH 14/97] Move condition
---
includes/dashboard.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index e18db89e6..3ab145f99 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -173,7 +173,8 @@ function DisplayDashboard(){
}
} else {
$status->addMessage(sprintf(_('Interface is %s.'), strtolower($interfaceState)), $classMsgDevicestatus);
- }
+
+ ?>
exec( 'pidof lokinet | wc -l', $lokinetstatus);
if( $lokinetstatus[0] == 0 ) {
@@ -182,8 +183,6 @@ function DisplayDashboard(){
} else {
$status = '<div class="alert alert-success alert-dismissable">Lokinet is running
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
- }
- ?>
<div class="row">
<div class="col-lg-12">
<div class="panel panel-primary">
From 4c0edee46b80b4b1888c67ca3014a90f6dff6114 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:24:55 -0400
Subject: [PATCH 15/97] definec currentLokiStatus
---
includes/dashboard.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 3ab145f99..70a8138f4 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -175,6 +175,7 @@ function DisplayDashboard(){
$status->addMessage(sprintf(_('Interface is %s.'), strtolower($interfaceState)), $classMsgDevicestatus);
?>
+$status currnetLokiState(){
exec( 'pidof lokinet | wc -l', $lokinetstatus);
if( $lokinetstatus[0] == 0 ) {
@@ -183,6 +184,7 @@ function DisplayDashboard(){
} else {
$status = '<div class="alert alert-success alert-dismissable">Lokinet is running
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
+}
<div class="row">
<div class="col-lg-12">
<div class="panel panel-primary">
From beabcd2588da499a00f58e2d26d71790fb1455cc Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:28:44 -0400
Subject: [PATCH 16/97] lokistata function
---
includes/dashboard.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 70a8138f4..aa62ac424 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -175,7 +175,7 @@ function DisplayDashboard(){
$status->addMessage(sprintf(_('Interface is %s.'), strtolower($interfaceState)), $classMsgDevicestatus);
?>
-$status currnetLokiState(){
+function currnetLokiState(){
exec( 'pidof lokinet | wc -l', $lokinetstatus);
if( $lokinetstatus[0] == 0 ) {
From 54f7cea3a73eca57219a403e91b0acf52704de88 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:30:03 -0400
Subject: [PATCH 17/97] loki function outside php
---
includes/dashboard.php | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index aa62ac424..987899ed3 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -173,18 +173,17 @@ function DisplayDashboard(){
}
} else {
$status->addMessage(sprintf(_('Interface is %s.'), strtolower($interfaceState)), $classMsgDevicestatus);
-
+ function currnetLokiState(){
+ exec( 'pidof lokinet | wc -l', $lokinetstatus);
+
+ if( $lokinetstatus[0] == 0 ) {
+ $status = '<div class="alert alert-warning alert-dismissable">Lokinet daemon is not running
+ <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
+ } else {
+ $status = '<div class="alert alert-success alert-dismissable">Lokinet is running
+ <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
+ }
?>
-function currnetLokiState(){
- exec( 'pidof lokinet | wc -l', $lokinetstatus);
-
- if( $lokinetstatus[0] == 0 ) {
- $status = '<div class="alert alert-warning alert-dismissable">Lokinet daemon is not running
- <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
- } else {
- $status = '<div class="alert alert-success alert-dismissable">Lokinet is running
- <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
-}
<div class="row">
<div class="col-lg-12">
<div class="panel panel-primary">
From eec7ad9a1bb500cdd1cb0df7a22f530e506b6e47 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:33:05 -0400
Subject: [PATCH 18/97] missing brace
---
includes/dashboard.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 987899ed3..3bdd9d506 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -173,6 +173,7 @@ function DisplayDashboard(){
}
} else {
$status->addMessage(sprintf(_('Interface is %s.'), strtolower($interfaceState)), $classMsgDevicestatus);
+}
function currnetLokiState(){
exec( 'pidof lokinet | wc -l', $lokinetstatus);
@@ -183,6 +184,7 @@ function currnetLokiState(){
$status = '<div class="alert alert-success alert-dismissable">Lokinet is running
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
}
+ }
?>
<div class="row">
<div class="col-lg-12">
From 20dc5452e47d3aee0394e2f19946059481dd60f6 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:43:14 -0400
Subject: [PATCH 19/97] report status
---
includes/dashboard.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 3bdd9d506..491dc75fb 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -192,6 +192,7 @@ function currnetLokiState(){
<div class="panel-heading"><i class="fa fa-dashboard fa-fw"></i> <?php echo _("Dashboard"); ?></div>
<div class="panel-body">
<p><?php $status->showMessages(); ?></p>
+ <p><?php echo $status; ?></p>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
From 56ade7579be6d05e14e40ab783905df3b798c54d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:49:57 -0400
Subject: [PATCH 20/97] Include function in tree
---
includes/dashboard.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 491dc75fb..2ff5158e4 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -184,7 +184,6 @@ function currnetLokiState(){
$status = '<div class="alert alert-success alert-dismissable">Lokinet is running
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
}
- }
?>
<div class="row">
<div class="col-lg-12">
@@ -192,7 +191,7 @@ function currnetLokiState(){
<div class="panel-heading"><i class="fa fa-dashboard fa-fw"></i> <?php echo _("Dashboard"); ?></div>
<div class="panel-body">
<p><?php $status->showMessages(); ?></p>
- <p><?php echo $status; ?></p>
+ <p><?php echo $status; ?></p>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
@@ -256,7 +255,7 @@ function currnetLokiState(){
<?php
}
-
+}
/**
* Get a human readable data size string from a number of bytes.
*
From a58d585f9c247f054265f04f38185c85ed70150c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:54:55 -0400
Subject: [PATCH 21/97] remove rabbit hole
---
includes/dashboard.php | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 2ff5158e4..3d27d5959 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -174,16 +174,6 @@ function DisplayDashboard(){
} else {
$status->addMessage(sprintf(_('Interface is %s.'), strtolower($interfaceState)), $classMsgDevicestatus);
}
- function currnetLokiState(){
- exec( 'pidof lokinet | wc -l', $lokinetstatus);
-
- if( $lokinetstatus[0] == 0 ) {
- $status = '<div class="alert alert-warning alert-dismissable">Lokinet daemon is not running
- <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
- } else {
- $status = '<div class="alert alert-success alert-dismissable">Lokinet is running
- <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
- }
?>
<div class="row">
<div class="col-lg-12">
@@ -255,7 +245,7 @@ function currnetLokiState(){
<?php
}
-}
+
/**
* Get a human readable data size string from a number of bytes.
*
From a76501f57c9aeba37433e690bb9e3dd5a6cecf26 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 12:56:38 -0400
Subject: [PATCH 22/97] shoot rabbit
---
includes/dashboard.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 3d27d5959..b2b3a930c 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -181,7 +181,6 @@ function DisplayDashboard(){
<div class="panel-heading"><i class="fa fa-dashboard fa-fw"></i> <?php echo _("Dashboard"); ?></div>
<div class="panel-body">
<p><?php $status->showMessages(); ?></p>
- <p><?php echo $status; ?></p>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
From 0da7efc67a23647547430830781636f5b8c3902d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 13:47:30 -0400
Subject: [PATCH 23/97] lokinet data
---
includes/functions.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 6d9e13db7..0815e61f6 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -372,8 +372,8 @@ function DisplayLokinetConfig(){
<form role="form" action="?page=save_hostapd_conf" method="POST">
<div class="row">
<div class="form-group col-md-4">
- <label for="code">VirtualAddrNetwork</label>
- <input type="text" class="form-control" name="virtualaddrnetwork" value="<?php echo htmlspecialchars($arrConfig['VirtualAddrNetwork'], ENT_QUOTES); ?>" />
+ <label for="code">lokinet-bootstrap URL</label>
+ <input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
</div>
<div class="row">
From c5d095b345bf91f3b45ca2ecd40c05eda34ca187 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:02:44 -0400
Subject: [PATCH 24/97] temp enable Tor
---
includes/config.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/includes/config.php b/includes/config.php
index 205226d19..d9aa28a98 100755
--- a/includes/config.php
+++ b/includes/config.php
@@ -26,11 +26,11 @@
define('RASPI_NETWORK_ENABLED', true );
define('RASPI_DHCP_ENABLED', true );
define('RASPI_OPENVPN_ENABLED', false );
-define('RASPI_TORPROXY_ENABLED', false );
+define('RASPI_TORPROXY_ENABLED', true );
define('RASPI_CONFAUTH_ENABLED', true );
define('RASPI_CHANGETHEME_ENABLED', true );
define('RASPI_VNSTAT_ENABLED', true );
// Locale settings
define('LOCALE_ROOT', 'locale');
-define('LOCALE_DOMAIN', 'messages');
+define('LOCALE_DOMAIN', 'messages');
From e0ffdeafc556a39185cc151dd4cf2e1582bbaeca Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:08:26 -0400
Subject: [PATCH 25/97] add Lokinet buttons
---
includes/functions.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 0815e61f6..53088f2ed 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -407,7 +407,13 @@ function DisplayLokinetConfig(){
</div>
</div>
</div>
-
+ <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
+ <?php
+ if( $torproxystatus[0] == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
+ } else {
+ echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
+ };
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
From ecf0c077bb2c7017cc126f9929ddf7a56c38359f Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:11:19 -0400
Subject: [PATCH 26/97] move function
---
includes/functions.php | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 53088f2ed..9d690a66f 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -407,13 +407,7 @@ function DisplayLokinetConfig(){
</div>
</div>
</div>
- <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
- <?php
- if( $torproxystatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
- } else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
- };
+
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
@@ -432,6 +426,14 @@ function DisplayLokinetConfig(){
</div>
</div>
+ <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
+ <?php
+ if( $torproxystatus[0] == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
+ } else {
+ echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
+ };
+
</div><!-- /.systemtabcontent -->
</div><!-- /.panel-default -->
From aef4b4b8b5165d58ba234cdcf4db8fe71db1d379 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:15:32 -0400
Subject: [PATCH 27/97] fix typo
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 9d690a66f..b24ba56c9 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -428,7 +428,7 @@ function DisplayLokinetConfig(){
<input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
<?php
- if( $torproxystatus[0] == 0 ) {
+ if( $lokinetstatus[0] == 0 ) {
echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
From 02f8ca61fc1bd30c396c7ac859e966674c3c5f22 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:18:34 -0400
Subject: [PATCH 28/97] close php function
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index b24ba56c9..086b43082 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,7 +433,7 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
};
-
+ ?>
</div><!-- /.systemtabcontent -->
</div><!-- /.panel-default -->
From 7fb3a0c3c0f10a1498e9dc490e046ea8b1731f8c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:23:31 -0400
Subject: [PATCH 29/97] move buttons to main tab
---
includes/functions.php | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 086b43082..7dd0ce94a 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -408,6 +408,15 @@ function DisplayLokinetConfig(){
</div>
</div>
+ <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
+ <?php
+ if( $lokinetstatus[0] == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
+ } else {
+ echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
+ };
+ ?>
+
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
@@ -426,14 +435,7 @@ function DisplayLokinetConfig(){
</div>
</div>
- <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
- <?php
- if( $lokinetstatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
- } else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
- };
- ?>
+
</div><!-- /.systemtabcontent -->
</div><!-- /.panel-default -->
From 6190468f0082f53189ad1ce435af6b53b216033f Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:27:13 -0400
Subject: [PATCH 30/97] move buttons to main tab
---
includes/functions.php | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 086b43082..7dd0ce94a 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -408,6 +408,15 @@ function DisplayLokinetConfig(){
</div>
</div>
+ <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
+ <?php
+ if( $lokinetstatus[0] == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
+ } else {
+ echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
+ };
+ ?>
+
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
@@ -426,14 +435,7 @@ function DisplayLokinetConfig(){
</div>
</div>
- <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
- <?php
- if( $lokinetstatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
- } else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
- };
- ?>
+
</div><!-- /.systemtabcontent -->
</div><!-- /.panel-default -->
From 20864da8ecb5de81424c3e4e2f49359e24714fcb Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:29:27 -0400
Subject: [PATCH 31/97] move to bottom
---
includes/functions.php | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 7dd0ce94a..380d2d52f 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -408,15 +408,6 @@ function DisplayLokinetConfig(){
</div>
</div>
- <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
- <?php
- if( $lokinetstatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
- } else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
- };
- ?>
-
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
@@ -435,6 +426,14 @@ function DisplayLokinetConfig(){
</div>
</div>
+ <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
+ <?php
+ if( $lokinetstatus[0] == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
+ } else {
+ echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
+ };
+ ?>
</div><!-- /.systemtabcontent -->
From 67de1835be912f960cd6ba0d5f780d50fb253b6c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:52:58 -0400
Subject: [PATCH 32/97] Add generate Lokinet button
---
includes/functions.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 380d2d52f..81f3f3d3f 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -429,9 +429,12 @@ function DisplayLokinetConfig(){
<input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
<?php
if( $lokinetstatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
+ };
+ if( cat ~/.lokinet/lokinet.ini == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
};
?>
From 07b23324bd98130725ec0d75758f3a341b2c20d7 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:54:31 -0400
Subject: [PATCH 33/97] test conditional output
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 81f3f3d3f..d46e11294 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,7 +433,7 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
};
- if( cat ~/.lokinet/lokinet.ini == 0 ) {
+ if( cat ~/.lokinet/lokinet.ini != 0 ) {
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
};
?>
From 84cc98cc1393e0bc77e350dd5643b088ee7e05d6 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:58:04 -0400
Subject: [PATCH 34/97] genrate re-gern
---
includes/functions.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index d46e11294..045d039b5 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -435,7 +435,9 @@ function DisplayLokinetConfig(){
};
if( cat ~/.lokinet/lokinet.ini != 0 ) {
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
- };
+ } else {
+ echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Re-Generate Lokinet" />' , PHP_EOL;
+ }
?>
</div><!-- /.systemtabcontent -->
From 60609ec40093c9f9cd71c753f31c51ed82f34b40 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:58:30 -0400
Subject: [PATCH 35/97] ;
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 045d039b5..a7caa8ad5 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -437,7 +437,7 @@ function DisplayLokinetConfig(){
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Re-Generate Lokinet" />' , PHP_EOL;
- }
+ };
?>
</div><!-- /.systemtabcontent -->
From b1face26645f46d2af5f9ea9da018d2e93df91c2 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 14:59:26 -0400
Subject: [PATCH 36/97] Change condition statement
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index a7caa8ad5..6852ec729 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,7 +433,7 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
};
- if( cat ~/.lokinet/lokinet.ini != 0 ) {
+ if( cat ~/.lokinet/lokinet.ini == 0 ) {
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Re-Generate Lokinet" />' , PHP_EOL;
From 408ca3dfead71525d4a2bcd3c015df61b31cc54d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:02:54 -0400
Subject: [PATCH 37/97] contents condition statement
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 6852ec729..094bc1c6d 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,7 +433,7 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
};
- if( cat ~/.lokinet/lokinet.ini == 0 ) {
+ if(-s ~/.lokinet/lokinet.ini) {
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Re-Generate Lokinet" />' , PHP_EOL;
From 8ecbad62ebe0d17255ecd748659e2d6e0416232e Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:05:22 -0400
Subject: [PATCH 38/97] test
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 094bc1c6d..c22861783 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,7 +433,7 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
};
- if(-s ~/.lokinet/lokinet.ini) {
+ if(1=1) {
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Re-Generate Lokinet" />' , PHP_EOL;
From d583c10aef8dbd0ab6c561f59c13efc601d5508d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:07:36 -0400
Subject: [PATCH 39/97] syntax
---
includes/functions.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index c22861783..76155c63b 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -432,11 +432,11 @@ function DisplayLokinetConfig(){
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
- };
+ }
if(1=1) {
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Re-Generate Lokinet" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-warning" name="RegenLokinet" value="Re-Generate Lokinet" />' , PHP_EOL;
};
?>
From 2af6365d4b2faeaa3c92af1949baec4cdc358cd2 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:11:23 -0400
Subject: [PATCH 40/97] grrr
---
includes/functions.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 76155c63b..fd42c304a 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -430,10 +430,9 @@ function DisplayLokinetConfig(){
<?php
if( $lokinetstatus[0] == 0 ) {
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
- } else {
+ } elseif {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
- }
- if(1=1) {
+ } elsif( 1=1 ) {
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="RegenLokinet" value="Re-Generate Lokinet" />' , PHP_EOL;
From e9c98895a1c450dbe332aede8c1d19f32f1a0fe5 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:13:50 -0400
Subject: [PATCH 41/97] shorten wording
---
includes/functions.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index fd42c304a..814cae3fe 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -432,10 +432,11 @@ function DisplayLokinetConfig(){
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
} elseif {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
- } elsif( 1=1 ) {
- echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate Lokinet" />' , PHP_EOL;
+ }
+ if( 1=1 ) {
+ echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-warning" name="RegenLokinet" value="Re-Generate Lokinet" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-warning" name="RegenLokinet" value="Re-Generate" />' , PHP_EOL;
};
?>
From ec13a5bfe8dc725eee9c9175b40f71b116906f7a Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:14:38 -0400
Subject: [PATCH 42/97] ;
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 814cae3fe..ba520eae2 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -432,7 +432,7 @@ function DisplayLokinetConfig(){
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
} elseif {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
- }
+ };
if( 1=1 ) {
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate" />' , PHP_EOL;
} else {
From de8a9352b806bbe6dc2e6d8e150451c255a762fd Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:15:46 -0400
Subject: [PATCH 43/97] connented
---
includes/functions.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index ba520eae2..28ddff6cd 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,11 +433,12 @@ function DisplayLokinetConfig(){
} elseif {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
};
- if( 1=1 ) {
+ /*() if( 1=1 ) {
echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="RegenLokinet" value="Re-Generate" />' , PHP_EOL;
};
+*/
?>
</div><!-- /.systemtabcontent -->
From 6bc628ff2d88e71c80b4eafedd360235f6bc26b0 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:21:31 -0400
Subject: [PATCH 44/97] insane
---
includes/functions.php | 38 ++++++++++++++++++--------------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 28ddff6cd..ce2effdef 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,30 +433,28 @@ function DisplayLokinetConfig(){
} elseif {
echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
};
- /*() if( 1=1 ) {
- echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate" />' , PHP_EOL;
- } else {
- echo '<input type="submit" class="btn btn-warning" name="RegenLokinet" value="Re-Generate" />' , PHP_EOL;
- };
-*/
- ?>
- </div><!-- /.systemtabcontent -->
+
- </div><!-- /.panel-default -->
- </div><!-- /.col-md-6 -->
- </div><!-- /.row -->
- </div><!-- /.panel-body -->
- </form>
- </div><!-- /.panel-primary -->
- <div class="panel-footer"></div>
- </div><!-- /.panel-primary -->
- </div><!-- /.col-lg-12 -->
- </div><!-- /.row -->
+ /* () if( 1=1 ) {
+ echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate" />' , PHP_EOL;
+ } else {
+ echo '<input type="submit" class="btn btn-warning" name="RegenLokinet" value="Re-Generate" />' , PHP_EOL;
+ };
+ */
-<?php
-}
+ ?>
+ </form>
+ </div><!-- /.tab-content -->
+ </div><!-- /.panel-body -->
+ <div class="panel-footer"> Information provided by tor</div>
+ </div><!-- /.panel-primary -->
+ </div><!-- /.col-lg-12 -->
+ </div><!-- /.row -->
+ <?php
+ }
+
/**
*
From ddebd3b77d3a5ffaa0db5bf91cd8e0828e975a99 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:27:54 -0400
Subject: [PATCH 45/97] patch
---
includes/functions.php | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index ce2effdef..fa2d99c07 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -426,26 +426,15 @@ function DisplayLokinetConfig(){
</div>
</div>
- <input type="submit" class="btn btn-outline btn-primary" name="SaveLokinetSettings" value="Save settings" />
- <?php
- if( $lokinetstatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
- } elseif {
- echo '<input type="submit" class="btn btn-warning" name="StopLokinet" value="Stop Lokinet" />' , PHP_EOL;
- };
-
-
-
- /* () if( 1=1 ) {
- echo '<input type="submit" class="btn btn-success" name="GenerateLokinet" value="Generate" />' , PHP_EOL;
- } else {
- echo '<input type="submit" class="btn btn-warning" name="RegenLokinet" value="Re-Generate" />' , PHP_EOL;
- };
- */
-
-
- ?>
- </form>
+ <input type="submit" class="btn btn-outline btn-primary" name="SaveTORProxySettings" value="Save settings" />
+ <?php
+ if( $torproxystatus[0] == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start TOR" />' , PHP_EOL;
+ } else {
+ echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop TOR" />' , PHP_EOL;
+ };
+ ?>
+ </form>
</div><!-- /.tab-content -->
</div><!-- /.panel-body -->
<div class="panel-footer"> Information provided by tor</div>
From afd1e1e07e065710f7bdf35d285315a24dc65b9c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:29:31 -0400
Subject: [PATCH 46/97] double down
---
includes/functions.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/includes/functions.php b/includes/functions.php
index fa2d99c07..b4fb03290 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,6 +433,11 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop TOR" />' , PHP_EOL;
};
+ if( $torproxystatus[0] == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start TOR" />' , PHP_EOL;
+ } else {
+ echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop TOR" />' , PHP_EOL;
+ };
?>
</form>
</div><!-- /.tab-content -->
From 6a3858125a2555d4bdb91ddb576bf4e0feb90988 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:31:30 -0400
Subject: [PATCH 47/97] Rename buttons
---
includes/functions.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index b4fb03290..7db39018f 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -429,14 +429,14 @@ function DisplayLokinetConfig(){
<input type="submit" class="btn btn-outline btn-primary" name="SaveTORProxySettings" value="Save settings" />
<?php
if( $torproxystatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start TOR" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop TOR" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
};
if( $torproxystatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start TOR" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Gnerate .ini" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop TOR" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Regenerate .ini" />' , PHP_EOL;
};
?>
</form>
From 9c5054c25f36b63b8b202c67534a3a449aa0d301 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 15:39:23 -0400
Subject: [PATCH 48/97] lokinet.ini test
---
includes/functions.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 7db39018f..02b619dbd 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,7 +433,8 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
};
- if( $torproxystatus[0] == 0 ) {
+ $filename = '~/.lokinet/lokinet.ini';
+ if (file_exists($filename)) {
echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Gnerate .ini" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Regenerate .ini" />' , PHP_EOL;
From dcbe04b3411b5eed67796d52f1f530ccdf533387 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 16:01:42 -0400
Subject: [PATCH 49/97] find home dir in php
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 02b619dbd..ecd49469f 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,7 +433,7 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
};
- $filename = '~/.lokinet/lokinet.ini';
+ $filename = '/home/pi/.lokinet/lokinet.ini';
if (file_exists($filename)) {
echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Gnerate .ini" />' , PHP_EOL;
} else {
From 6639327a57a931214670e5e771bfa48f9493d8d0 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 16:05:05 -0400
Subject: [PATCH 50/97] double quote
---
includes/functions.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index ecd49469f..70255cd60 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,9 +433,9 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
};
- $filename = '/home/pi/.lokinet/lokinet.ini';
+ $filename = "/home/pi/.lokinet/lokinet.ini";
if (file_exists($filename)) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Gnerate .ini" />' , PHP_EOL;
+ echo '<input tpe="submit" class="btn btn-success" name="StartTOR" value="Gnerate .ini" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Regenerate .ini" />' , PHP_EOL;
};
From a06d82c8413a246d11394082310a0ed4dbd8225d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 16:11:19 -0400
Subject: [PATCH 51/97] single
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 70255cd60..0b6074b5d 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,7 +433,7 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
};
- $filename = "/home/pi/.lokinet/lokinet.ini";
+ $filename = `/home/pi/.lokinet/lokinet.ini`;
if (file_exists($filename)) {
echo '<input tpe="submit" class="btn btn-success" name="StartTOR" value="Gnerate .ini" />' , PHP_EOL;
} else {
From 4b79d8b14c8de6fbe1bcdcd7e4cf10182ccf056d Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 16:25:41 -0400
Subject: [PATCH 52/97] single quote relative path
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 0b6074b5d..1cd69aafa 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -433,7 +433,7 @@ function DisplayLokinetConfig(){
} else {
echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
};
- $filename = `/home/pi/.lokinet/lokinet.ini`;
+ $filename = '/home/pi/.lokinet/lokinet.ini';
if (file_exists($filename)) {
echo '<input tpe="submit" class="btn btn-success" name="StartTOR" value="Gnerate .ini" />' , PHP_EOL;
} else {
From 691dba44288fdd98d5efeccae74dbd60c5cce42a Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 16:34:15 -0400
Subject: [PATCH 53/97] Buttons and echo mesasge added
---
includes/functions.php | 47 +++++++-----------------------------------
1 file changed, 8 insertions(+), 39 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 1cd69aafa..9137b909c 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -376,38 +376,7 @@ function DisplayLokinetConfig(){
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
</div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">AutomapHostsSuffixes</label>
- <input type="text" class="form-control" name="automaphostssuffixes" value="<?php echo htmlspecialchars($arrConfig['AutomapHostsSuffixes'], ENT_QUOTES); ?>" />
- </div>
- </div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">AutomapHostsOnResolve</label>
- <input type="text" class="form-control" name="automaphostsonresolve" value="<?php echo htmlspecialchars($arrConfig['AutomapHostsOnResolve'], ENT_QUOTES); ?>" />
- </div>
- </div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">TransListenAddress</label>
- <input type="text" class="form-control" name="translistenaddress" value="<?php echo htmlspecialchars($arrConfig['TransListenAddress'], ENT_QUOTES); ?>" />
- </div>
- </div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">DNSPort</label>
- <input type="text" class="form-control" name="dnsport" value="<?php echo htmlspecialchars($arrConfig['DNSPort'], ENT_QUOTES); ?>" />
- </div>
- </div>
- <div class="row">
- <div class="form-group col-md-4">
- <label for="code">DNSListenAddress</label>
- <input type="text" class="form-control" name="dnslistenaddress" value="<?php echo htmlspecialchars($arrConfig['DNSListenAddress'], ENT_QUOTES); ?>" />
- </div>
- </div>
- </div>
-
+ echo 'Contact Loki community for latest lokinet-bootstrap';
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
@@ -426,18 +395,18 @@ function DisplayLokinetConfig(){
</div>
</div>
- <input type="submit" class="btn btn-outline btn-primary" name="SaveTORProxySettings" value="Save settings" />
+ <input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
- if( $torproxystatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start Lokinet" />' , PHP_EOL;
+ if( $lokinetstatus[0] == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Stop Lokinet" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-warning" name="StopLokient" value="Stop Lokinet" />' , PHP_EOL;
};
$filename = '/home/pi/.lokinet/lokinet.ini';
- if (file_exists($filename)) {
- echo '<input tpe="submit" class="btn btn-success" name="StartTOR" value="Gnerate .ini" />' , PHP_EOL;
+ if (!file_exists($filename)) {
+ echo '<input tpe="submit" class="btn btn-success" name="GenerateLokinet" value="Gnerate .ini" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-warning" name="StopTOR" value="Regenerate .ini" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-warning" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
};
?>
</form>
From f74f9fe56f66ca7b037f5556c7587410ea893613 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 16:46:17 -0400
Subject: [PATCH 54/97] Note in form
---
includes/functions.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 9137b909c..391379e61 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -376,7 +376,12 @@ function DisplayLokinetConfig(){
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
</div>
- echo 'Contact Loki community for latest lokinet-bootstrap';
+ <form>
+ <div class="form-group row">
+ <label for="staticEmail" class="col-sm-2 col-form-label">Email</label>
+ <div class="col-md-10">
+ <input type="text" readonly class="form-control-plaintext" id="staticEmail" value="Contact Loki user groups for latest bootstrap">
+ </div>
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
@@ -412,7 +417,7 @@ function DisplayLokinetConfig(){
</form>
</div><!-- /.tab-content -->
</div><!-- /.panel-body -->
- <div class="panel-footer"> Information provided by tor</div>
+ <div class="panel-footer"> Information provided by Lokinet</div>
</div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 -->
</div><!-- /.row -->
From e65826e2c7c14e00e8095bf1e8006603dd2f670f Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 16:57:01 -0400
Subject: [PATCH 55/97] buttons more visible
---
includes/functions.php | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 391379e61..1649d83f1 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -376,12 +376,7 @@ function DisplayLokinetConfig(){
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
</div>
- <form>
- <div class="form-group row">
- <label for="staticEmail" class="col-sm-2 col-form-label">Email</label>
- <div class="col-md-10">
- <input type="text" readonly class="form-control-plaintext" id="staticEmail" value="Contact Loki user groups for latest bootstrap">
- </div>
+ <h3>Contact Loki user groups for the latest bootstrap</h3>
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
@@ -405,13 +400,13 @@ function DisplayLokinetConfig(){
if( $lokinetstatus[0] == 0 ) {
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-warning" name="StopLokient" value="Stop Lokinet" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-danger" name="StopLokient" value="Stop Lokinet" />' , PHP_EOL;
};
$filename = '/home/pi/.lokinet/lokinet.ini';
if (!file_exists($filename)) {
echo '<input tpe="submit" class="btn btn-success" name="GenerateLokinet" value="Gnerate .ini" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-warning" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
};
?>
</form>
From a8854ef4b42adf9842c4dd5e9daf110a5e17cbd7 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 16:59:10 -0400
Subject: [PATCH 56/97] Modify text size
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 1649d83f1..457bb9430 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -376,7 +376,7 @@ function DisplayLokinetConfig(){
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
</div>
- <h3>Contact Loki user groups for the latest bootstrap</h3>
+ <h5>Contact Loki user groups for the latest bootstrap</h5>
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
From 39b4bb80556d372fb1bd17749cf35724d46c2e13 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 17:07:01 -0400
Subject: [PATCH 57/97] move form
---
includes/functions.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 457bb9430..9f5af0ef6 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -376,6 +376,7 @@ function DisplayLokinetConfig(){
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
</div>
+ </form>
<h5>Contact Loki user groups for the latest bootstrap</h5>
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
@@ -409,7 +410,7 @@ function DisplayLokinetConfig(){
echo '<input type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
};
?>
- </form>
+
</div><!-- /.tab-content -->
</div><!-- /.panel-body -->
<div class="panel-footer"> Information provided by Lokinet</div>
From b0dcd374db530e7279b3a2275077121a313bf6ef Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 17:19:13 -0400
Subject: [PATCH 58/97] Fix rows
---
includes/functions.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 9f5af0ef6..d3fa3c109 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -375,9 +375,10 @@ function DisplayLokinetConfig(){
<label for="code">lokinet-bootstrap URL</label>
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
- </div>
- </form>
<h5>Contact Loki user groups for the latest bootstrap</h5>
+ </div>
+ </div>
+
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
@@ -396,6 +397,7 @@ function DisplayLokinetConfig(){
</div>
</div>
+
<input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
if( $lokinetstatus[0] == 0 ) {
@@ -410,7 +412,7 @@ function DisplayLokinetConfig(){
echo '<input type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
};
?>
-
+ </form>
</div><!-- /.tab-content -->
</div><!-- /.panel-body -->
<div class="panel-footer"> Information provided by Lokinet</div>
From 01be775fe2541bb2fce7bbd02d8d9cec980f26d1 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 17:30:06 -0400
Subject: [PATCH 59/97] hard returns
---
includes/functions.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/includes/functions.php b/includes/functions.php
index d3fa3c109..79cb85c26 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -375,6 +375,7 @@ function DisplayLokinetConfig(){
<label for="code">lokinet-bootstrap URL</label>
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
+ <hr>
<h5>Contact Loki user groups for the latest bootstrap</h5>
</div>
</div>
@@ -393,6 +394,7 @@ function DisplayLokinetConfig(){
<h2>This is Loki</h2>
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
+ <hr>
</div>
</div>
</div>
From 53ba872798f93123d11b3b2991f38cc8a27f4dd4 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 17:38:10 -0400
Subject: [PATCH 60/97] frames
---
includes/functions.php | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 79cb85c26..f648c8737 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -376,9 +376,13 @@ function DisplayLokinetConfig(){
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
<hr>
- <h5>Contact Loki user groups for the latest bootstrap</h5>
- </div>
- </div>
+ <div class="row">
+ <div class="col-lg-12">
+ <h5>Contact Loki user groups for the latest bootstrap</h5>
+ </div>
+ </div>
+ </div>
+ </div>
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
@@ -394,7 +398,6 @@ function DisplayLokinetConfig(){
<h2>This is Loki</h2>
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/Lykh-NqkKys"></iframe>
- <hr>
</div>
</div>
</div>
@@ -411,7 +414,8 @@ function DisplayLokinetConfig(){
if (!file_exists($filename)) {
echo '<input tpe="submit" class="btn btn-success" name="GenerateLokinet" value="Gnerate .ini" />' , PHP_EOL;
} else {
- echo '<input type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
+ echo '<inpu
+ t type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
};
?>
</form>
From 00494bdb75d0b6514f402e2c6c8f1a8b8ef1f6e4 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 17:43:09 -0400
Subject: [PATCH 61/97] Button relocate
---
includes/functions.php | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index f648c8737..f5668364d 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -379,7 +379,22 @@ function DisplayLokinetConfig(){
<div class="row">
<div class="col-lg-12">
<h5>Contact Loki user groups for the latest bootstrap</h5>
- </div>
+ <input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
+ <?php
+ if( $lokinetstatus[0] == 0 ) {
+ echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
+ } else {
+ echo '<input type="submit" class="btn btn-danger" name="StopLokient" value="Stop Lokinet" />' , PHP_EOL;
+ };
+ $filename = '/home/pi/.lokinet/lokinet.ini';
+ if (!file_exists($filename)) {
+ echo '<input tpe="submit" class="btn btn-success" name="GenerateLokinet" value="Gnerate .ini" />' , PHP_EOL;
+ } else {
+ echo '<inpu
+ t type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
+ };
+ ?>
+ </div>
</div>
</div>
</div>
@@ -403,21 +418,7 @@ function DisplayLokinetConfig(){
</div>
- <input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
- <?php
- if( $lokinetstatus[0] == 0 ) {
- echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
- } else {
- echo '<input type="submit" class="btn btn-danger" name="StopLokient" value="Stop Lokinet" />' , PHP_EOL;
- };
- $filename = '/home/pi/.lokinet/lokinet.ini';
- if (!file_exists($filename)) {
- echo '<input tpe="submit" class="btn btn-success" name="GenerateLokinet" value="Gnerate .ini" />' , PHP_EOL;
- } else {
- echo '<inpu
- t type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
- };
- ?>
+
</form>
</div><!-- /.tab-content -->
</div><!-- /.panel-body -->
From 35e7e9da77ad08a5d90e4bf1f76be93154d9022c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 17:46:43 -0400
Subject: [PATCH 62/97] widen 12-16 line 300
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index f5668364d..005063259 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -377,7 +377,7 @@ function DisplayLokinetConfig(){
</div>
<hr>
<div class="row">
- <div class="col-lg-12">
+ <div class="col-lg-16">
<h5>Contact Loki user groups for the latest bootstrap</h5>
<input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
From 6bd12d8f7baec3189e8937617fd528e087e5ea41 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 17:48:08 -0400
Subject: [PATCH 63/97] returned to 12
---
includes/functions.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 005063259..1ccef17b1 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -377,7 +377,7 @@ function DisplayLokinetConfig(){
</div>
<hr>
<div class="row">
- <div class="col-lg-16">
+ <div class="col-lg-12">
<h5>Contact Loki user groups for the latest bootstrap</h5>
<input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
@@ -390,8 +390,7 @@ function DisplayLokinetConfig(){
if (!file_exists($filename)) {
echo '<input tpe="submit" class="btn btn-success" name="GenerateLokinet" value="Gnerate .ini" />' , PHP_EOL;
} else {
- echo '<inpu
- t type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
+ echo '<input type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
};
?>
</div>
From f545b4d284adb7ddc6d134141931ffadf066f9ea Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 17:51:40 -0400
Subject: [PATCH 64/97] Change tab names
---
includes/functions.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 1ccef17b1..5fde1a8de 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -355,9 +355,9 @@ function DisplayLokinetConfig(){
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs">
- <li class="active"><a href="#basic" data-toggle="tab">Basic</a>
+ <li class="active"><a href="#basic" data-toggle="tab">Daemon Control</a>
</li>
- <li><a href="#daemon" data-toggle="tab">Lokinet Daemon Console</a>
+ <li><a href="#daemon" data-toggle="tab">Adanced Console User</a>
</li>
<li><a href="#youtube" data-toggle="tab">This is Loki</a>
</li>
@@ -377,7 +377,7 @@ function DisplayLokinetConfig(){
</div>
<hr>
<div class="row">
- <div class="col-lg-12">
+ <div class="col-md-4">
<h5>Contact Loki user groups for the latest bootstrap</h5>
<input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
From 50da7a3ba557353ceff881e53c1f32bfda2889b0 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 17:58:19 -0400
Subject: [PATCH 65/97] Move buttons off margin
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 5fde1a8de..67d0cca95 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -379,7 +379,7 @@ function DisplayLokinetConfig(){
<div class="row">
<div class="col-md-4">
<h5>Contact Loki user groups for the latest bootstrap</h5>
- <input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
+ <input type="submit" class="btn btn-outline btn-primary mr-1" name="ApplyLokinetSettings" value="Apply" />
<?php
if( $lokinetstatus[0] == 0 ) {
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
From 45d3e7ca25c5058f2fa955cd39639893a75ae7c7 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:01:16 -0400
Subject: [PATCH 66/97] Increase font
---
includes/functions.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 67d0cca95..6918e0edf 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -378,8 +378,8 @@ function DisplayLokinetConfig(){
<hr>
<div class="row">
<div class="col-md-4">
- <h5>Contact Loki user groups for the latest bootstrap</h5>
- <input type="submit" class="btn btn-outline btn-primary mr-1" name="ApplyLokinetSettings" value="Apply" />
+ <h4>Contact Loki user groups for the latest bootstrap</h4>
+ <input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
if( $lokinetstatus[0] == 0 ) {
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
From 510c55c53bbedd6719c1fb70ac2ce23f3fd5bab1 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:03:42 -0400
Subject: [PATCH 67/97] formatting
---
includes/functions.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 6918e0edf..70e753faf 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -357,7 +357,7 @@ function DisplayLokinetConfig(){
<ul class="nav nav-tabs">
<li class="active"><a href="#basic" data-toggle="tab">Daemon Control</a>
</li>
- <li><a href="#daemon" data-toggle="tab">Adanced Console User</a>
+ <li><a href="#daemon" data-toggle="tab">Advanced Console User</a>
</li>
<li><a href="#youtube" data-toggle="tab">This is Loki</a>
</li>
@@ -377,8 +377,8 @@ function DisplayLokinetConfig(){
</div>
<hr>
<div class="row">
- <div class="col-md-4">
- <h4>Contact Loki user groups for the latest bootstrap</h4>
+ <div class="col-md-12">
+ <h5>Contact Loki user groups for the latest bootstrap</h5>
<input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
if( $lokinetstatus[0] == 0 ) {
From a95e68e02155e2bedc015b07c6f5e19b5de4198b Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:04:49 -0400
Subject: [PATCH 68/97] 200 col 12
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 70e753faf..13bfb39aa 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -377,7 +377,7 @@ function DisplayLokinetConfig(){
</div>
<hr>
<div class="row">
- <div class="col-md-12">
+ <div class="col-lg-12">
<h5>Contact Loki user groups for the latest bootstrap</h5>
<input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
From d1e4e13fe072c901243d958e1bb46ec89598cffe Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:11:04 -0400
Subject: [PATCH 69/97] columns
---
includes/functions.php | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 13bfb39aa..c7ebc7836 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -370,12 +370,11 @@ function DisplayLokinetConfig(){
<div class="tab-pane fade in active" id="basic">
<h4>Basic settings</h4>
<form role="form" action="?page=save_hostapd_conf" method="POST">
- <div class="row">
- <div class="form-group col-md-4">
+ <div class="row">
+ <div class="form-group col-lg-12">
<label for="code">lokinet-bootstrap URL</label>
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
</div>
- <hr>
<div class="row">
<div class="col-lg-12">
<h5>Contact Loki user groups for the latest bootstrap</h5>
@@ -393,7 +392,7 @@ function DisplayLokinetConfig(){
echo '<input type="submit" class="btn btn-danger" name="ReGenerateLokinet" value="Regenerate .ini" />' , PHP_EOL;
};
?>
- </div>
+ </div>
</div>
</div>
</div>
From 1f3958d2179e79dc6f1960177ff45a936c62828e Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:14:21 -0400
Subject: [PATCH 70/97] simplified
---
includes/functions.php | 3 ---
1 file changed, 3 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index c7ebc7836..b385c80cc 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -374,9 +374,6 @@ function DisplayLokinetConfig(){
<div class="form-group col-lg-12">
<label for="code">lokinet-bootstrap URL</label>
<input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
- </div>
- <div class="row">
- <div class="col-lg-12">
<h5>Contact Loki user groups for the latest bootstrap</h5>
<input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
From 5d55aa82b8cb17b6e8ce9138aedcebe826949066 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:16:40 -0400
Subject: [PATCH 71/97] add row
---
includes/functions.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/includes/functions.php b/includes/functions.php
index b385c80cc..7e0dc38fb 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -393,6 +393,7 @@ function DisplayLokinetConfig(){
</div>
</div>
</div>
+ </div>
<div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
From 1d73662f832aba80bbaa31e4ff9c6cc76ba91614 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:23:53 -0400
Subject: [PATCH 72/97] Fix formatting
---
includes/functions.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 7e0dc38fb..f3908d0a9 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -392,10 +392,8 @@ function DisplayLokinetConfig(){
</div>
</div>
</div>
- </div>
- </div>
- <div class="tab-pane fade" id="daemon">
+ <div class="tab-pane fade" id="daemon">
<h4>Lokient Daemon</h4>
<div class="row">
<div class="col-lg-12">
@@ -421,7 +419,7 @@ function DisplayLokinetConfig(){
<div class="panel-footer"> Information provided by Lokinet</div>
</div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 -->
- </div><!-- /.row -->
+ </div><!-- /.row -->
<?php
}
From ed8342d46dcf32123e0e5f877cbc2756330648bf Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:30:31 -0400
Subject: [PATCH 73/97] provide placeholder value
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index f3908d0a9..8c8a04fcc 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -373,7 +373,7 @@ function DisplayLokinetConfig(){
<div class="row">
<div class="form-group col-lg-12">
<label for="code">lokinet-bootstrap URL</label>
- <input type="text" class="form-control" name="loinetbootstrap" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
+ <input type="text" class="form-control" name="loinetbootstrap" placeholder="http://206.81.100.174/n-st-5.signed" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
<h5>Contact Loki user groups for the latest bootstrap</h5>
<input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
<?php
From 46542851daa436bcc71295d83c5cd0c296b4953c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:40:06 -0400
Subject: [PATCH 74/97] Clarify button press
---
includes/functions.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 8c8a04fcc..b9aba9b36 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -372,10 +372,10 @@ function DisplayLokinetConfig(){
<form role="form" action="?page=save_hostapd_conf" method="POST">
<div class="row">
<div class="form-group col-lg-12">
- <label for="code">lokinet-bootstrap URL</label>
+ <label for="code">Update lokinet-bootstrap settings/label>
<input type="text" class="form-control" name="loinetbootstrap" placeholder="http://206.81.100.174/n-st-5.signed" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
- <h5>Contact Loki user groups for the latest bootstrap</h5>
- <input type="submit" class="btn btn-outline btn-primary" name="ApplyLokinetSettings" value="Apply" />
+ <h5>Contact Loki user groups for the latest bootstrap file location</h5>
+ <input type="submit" class="btn btn-outline btn-success" name="ApplyLokinetSettings" value="Apply Bootstrap" />
<?php
if( $lokinetstatus[0] == 0 ) {
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
From 3e635f6cb551118966046dcc17d99689fcc39523 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:42:09 -0400
Subject: [PATCH 75/97] Deactivate Tor
---
includes/config.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/config.php b/includes/config.php
index d9aa28a98..f5f352233 100755
--- a/includes/config.php
+++ b/includes/config.php
@@ -26,7 +26,7 @@
define('RASPI_NETWORK_ENABLED', true );
define('RASPI_DHCP_ENABLED', true );
define('RASPI_OPENVPN_ENABLED', false );
-define('RASPI_TORPROXY_ENABLED', true );
+define('RASPI_TORPROXY_ENABLED', false );
define('RASPI_CONFAUTH_ENABLED', true );
define('RASPI_CHANGETHEME_ENABLED', true );
define('RASPI_VNSTAT_ENABLED', true );
From b4b39d928e88f55c783e7805c49e86fcc9696374 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:44:05 -0400
Subject: [PATCH 76/97] change label
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index b9aba9b36..ea7be93fa 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -372,7 +372,7 @@ function DisplayLokinetConfig(){
<form role="form" action="?page=save_hostapd_conf" method="POST">
<div class="row">
<div class="form-group col-lg-12">
- <label for="code">Update lokinet-bootstrap settings/label>
+ <label for="code">Update lokinet-bootstrap settings</label>
<input type="text" class="form-control" name="loinetbootstrap" placeholder="http://206.81.100.174/n-st-5.signed" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
<h5>Contact Loki user groups for the latest bootstrap file location</h5>
<input type="submit" class="btn btn-outline btn-success" name="ApplyLokinetSettings" value="Apply Bootstrap" />
From 303f14f05cf39287b4a8cce420b10caba6304866 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:46:30 -0400
Subject: [PATCH 77/97] fix button contrast
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index ea7be93fa..8fc0aee0e 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -375,7 +375,7 @@ function DisplayLokinetConfig(){
<label for="code">Update lokinet-bootstrap settings</label>
<input type="text" class="form-control" name="loinetbootstrap" placeholder="http://206.81.100.174/n-st-5.signed" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
<h5>Contact Loki user groups for the latest bootstrap file location</h5>
- <input type="submit" class="btn btn-outline btn-success" name="ApplyLokinetSettings" value="Apply Bootstrap" />
+ <input type="submit" class="btn btn-dark" name="ApplyLokinetSettings" value="Apply Bootstrap" />
<?php
if( $lokinetstatus[0] == 0 ) {
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
From 4cc93825182910134f3c341986d719151be7d1a7 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 18:50:12 -0400
Subject: [PATCH 78/97] change to green
---
includes/functions.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/functions.php b/includes/functions.php
index 8fc0aee0e..de0321d3f 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -375,7 +375,7 @@ function DisplayLokinetConfig(){
<label for="code">Update lokinet-bootstrap settings</label>
<input type="text" class="form-control" name="loinetbootstrap" placeholder="http://206.81.100.174/n-st-5.signed" value="<?php echo htmlspecialchars($arrConfig['lokinetbootstrap'], ENT_QUOTES); ?>" />
<h5>Contact Loki user groups for the latest bootstrap file location</h5>
- <input type="submit" class="btn btn-dark" name="ApplyLokinetSettings" value="Apply Bootstrap" />
+ <input type="submit" class="btn btn-success" name="ApplyLokinetSettings" value="Apply Bootstrap" />
<?php
if( $lokinetstatus[0] == 0 ) {
echo '<input type="submit" class="btn btn-success" name="StartLokinet" value="Start Lokinet" />' , PHP_EOL;
From 6dcca791d4234d3827e05c4b08473138d8331355 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 19:11:13 -0400
Subject: [PATCH 79/97] formatting
---
index.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/index.php b/index.php
index cb4b1bfe4..147021a79 100755
--- a/index.php
+++ b/index.php
@@ -9,7 +9,7 @@
* lighttpd (I have version 1.4.31-2 installed via apt)
* php5-cgi (I have version 5.4.4-12 installed via apt)
* along with their supporting packages, php5 will also need to be enabled.
- *
+ *
* @author Lawrence Yau <sirlagz@gmail.com>
* @author Bill Zimmerman <billzimmerman@gmail.com>
* @license GNU General Public License, version 3 (GPL-3.0)
@@ -131,7 +131,7 @@
<?php if ( RASPI_NETWORK_ENABLED ) : ?>
<li>
<a href="index.php?page=network_conf"><i class="fa fa-sitemap fa-fw"></i> <?php echo _("Configure networking"); ?></a>
- </li>
+ </li>
<?php endif; ?>
<?php if ( RASPI_DHCP_ENABLED ) : ?>
<li>
@@ -187,7 +187,7 @@
</div>
</div><!-- /.row -->
- <?php
+ <?php
$extraFooterScripts = array();
// handle page actions
switch( $page ) {
@@ -209,7 +209,7 @@
case "openvpn_conf":
DisplayOpenVPNConfig();
break;
- case "lokinet_conf":
+ case "lokinet_conf":
DisplayLokinetConfig();
break;
case "torproxy_conf":
@@ -235,7 +235,7 @@
}
?>
- </div><!-- /#page-wrapper -->
+ </div><!-- /#page-wrapper -->
</div><!-- /#wrapper -->
<!-- RaspAP JavaScript -->
From 4d326517399b726d347b1afa3a1ed1b1393b48ff Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:00:45 -0400
Subject: [PATCH 80/97] copy test
---
index.php | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/index.php b/index.php
index 147021a79..75a2e46fa 100755
--- a/index.php
+++ b/index.php
@@ -118,10 +118,10 @@
<li>
<a href="index.php?page=wlan0_info"><i class="fa fa-dashboard fa-fw"></i> <?php echo _("Dashboard"); ?></a>
</li>
- <?php if ( RASPI_WIFICLIENT_ENABLED ) : ?>
+ <?php if ( RASPI_WIFICLIENT_ENABLED ) : ?>
<li>
<a href="index.php?page=wpa_conf"><i class="fa fa-signal fa-fw"></i> <?php echo _("Configure WiFi client"); ?></a>
- </li>
+ </li>
<?php endif; ?>
<?php if ( RASPI_HOTSPOT_ENABLED ) : ?>
<li>
@@ -143,7 +143,7 @@
<a href="index.php?page=openvpn_conf"><i class="fa fa-lock fa-fw"></i> <?php echo _("Configure OpenVPN"); ?></a>
</li>
<?php endif; ?>
- <?php if ( RASPI_LOKINET_ENABLED ) : ?>
+ <?php if ( RASPI_LOKINET_ENABLED ) : ?>
<li>
<a href="index.php?page=lokinet_conf"><i class="fa fa-eye-slash fa-fw"></i> <?php echo _("Configure Lokinet"); ?></a>
</li>
@@ -256,6 +256,29 @@
<!-- Custom RaspAP JS -->
<script src="js/custom.js"></script>
+ // button press start
+
+ <button class="btn" data-clipboard-text="Este texto sera copiado">cCopy Address</button>
+
+<script>
+var clipboard = new Clipboard('.btn');
+
+clipboard.on('success', function(e) {
+ console.info('Accion:', e.action);
+ console.info('Texto:', e.text);
+ console.info('Trigger:', e.trigger);
+
+ e.clearSelection();
+});
+
+clipboard.on('error', function(e) {
+ console.error('Accion:', e.action);
+ console.error('Trigger:', e.trigger);
+});
+</script>
+
+ // butoon press end
+
<?php
// Load non default JS/ECMAScript in footer.
foreach ($extraFooterScripts as $script) {
From 9b0f35edd5045e1070dc2749301c0fbf08b253d4 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:04:23 -0400
Subject: [PATCH 81/97] proper address
---
index.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/index.php b/index.php
index 75a2e46fa..e6a35a041 100755
--- a/index.php
+++ b/index.php
@@ -256,9 +256,8 @@
<!-- Custom RaspAP JS -->
<script src="js/custom.js"></script>
- // button press start
- <button class="btn" data-clipboard-text="Este texto sera copiado">cCopy Address</button>
+ <button class="btn" data-clipboard-text="LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf">Copy Address</button>
<script>
var clipboard = new Clipboard('.btn');
@@ -277,7 +276,7 @@
});
</script>
- // butoon press end
+
<?php
// Load non default JS/ECMAScript in footer.
From 72aa4b0b46532303eb7aa0dcc0d75df9eb212764 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:14:34 -0400
Subject: [PATCH 82/97] move script to custom.js
---
index.php | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/index.php b/index.php
index e6a35a041..95846beb5 100755
--- a/index.php
+++ b/index.php
@@ -259,22 +259,7 @@
<button class="btn" data-clipboard-text="LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf">Copy Address</button>
-<script>
-var clipboard = new Clipboard('.btn');
-
-clipboard.on('success', function(e) {
- console.info('Accion:', e.action);
- console.info('Texto:', e.text);
- console.info('Trigger:', e.trigger);
-
- e.clearSelection();
-});
-
-clipboard.on('error', function(e) {
- console.error('Accion:', e.action);
- console.error('Trigger:', e.trigger);
-});
-</script>
+
From 3cefb5a5ba55ea115d23799a6f2f5ed5df0df4ca Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:15:12 -0400
Subject: [PATCH 83/97] script added to custom.js
---
js/custom.js | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/js/custom.js b/js/custom.js
index d660f45e4..dc635f735 100644
--- a/js/custom.js
+++ b/js/custom.js
@@ -149,4 +149,19 @@ $().ready(function(){
}
});
+<script>
+var clipboard = new Clipboard('.btn');
+clipboard.on('success', function(e) {
+ console.info('Accion:', e.action);
+ console.info('Texto:', e.text);
+ console.info('Trigger:', e.trigger);
+
+ e.clearSelection();
+});
+
+clipboard.on('error', function(e) {
+ console.error('Accion:', e.action);
+ console.error('Trigger:', e.trigger);
+});
+</script>
From 01ecb8a013ba29afd33dbaa3eead34426cb698c3 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:28:16 -0400
Subject: [PATCH 84/97] remove script from custom.js
---
js/custom.js | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/js/custom.js b/js/custom.js
index dc635f735..dc7a9815b 100644
--- a/js/custom.js
+++ b/js/custom.js
@@ -148,20 +148,3 @@ $().ready(function(){
break;
}
});
-
-<script>
-var clipboard = new Clipboard('.btn');
-
-clipboard.on('success', function(e) {
- console.info('Accion:', e.action);
- console.info('Texto:', e.text);
- console.info('Trigger:', e.trigger);
-
- e.clearSelection();
-});
-
-clipboard.on('error', function(e) {
- console.error('Accion:', e.action);
- console.error('Trigger:', e.trigger);
-});
-</script>
From ed7a3ebe86e5110f09c02256211ac815132f80c3 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:33:14 -0400
Subject: [PATCH 85/97] Custom.js
---
index.php | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/index.php b/index.php
index 95846beb5..dc3ad46f6 100755
--- a/index.php
+++ b/index.php
@@ -256,12 +256,16 @@
<!-- Custom RaspAP JS -->
<script src="js/custom.js"></script>
+ <!-- Custom Clipboard JS -->
+ <script src="dist/clipboard.min.js"></script>
- <button class="btn" data-clipboard-text="LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf">Copy Address</button>
-
-
-
+ <!-- Target -->
+ <textarea id="bar">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
+ <!-- Trigger -->
+ <button class="btn" data-clipboard-action="cut" data-clipboard-target="#bar">
+ Cut to clipboard
+ </button>
<?php
// Load non default JS/ECMAScript in footer.
From d1919e0bc3664d890bc4202e56e4a5f537b3567b Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:44:33 -0400
Subject: [PATCH 86/97] Instantiate function
---
index.php | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/index.php b/index.php
index dc3ad46f6..d920d413e 100755
--- a/index.php
+++ b/index.php
@@ -258,6 +258,16 @@
<!-- Custom Clipboard JS -->
<script src="dist/clipboard.min.js"></script>
+ <script>
+ var btns = document.querySelectorAll('button');
+ var clipboard = new ClipboardJS(btns);
+ clipboard.on('success', function(e) {
+ console.log(e);
+});
+ clipboard.on('error', function(e) {
+ console.log(e);
+ });
+ </script>
<!-- Target -->
<textarea id="bar">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
From 2d2af8c6d20ca127c0e12bd400ba1cf8505a5110 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:47:41 -0400
Subject: [PATCH 87/97] remove clipboard
---
index.php | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/index.php b/index.php
index d920d413e..ae71b1e6d 100755
--- a/index.php
+++ b/index.php
@@ -171,6 +171,7 @@
<li>
<a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></a>
</li>
+ <textarea id="bar">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.navbar-default -->
@@ -256,26 +257,8 @@
<!-- Custom RaspAP JS -->
<script src="js/custom.js"></script>
- <!-- Custom Clipboard JS -->
- <script src="dist/clipboard.min.js"></script>
- <script>
- var btns = document.querySelectorAll('button');
- var clipboard = new ClipboardJS(btns);
- clipboard.on('success', function(e) {
- console.log(e);
-});
- clipboard.on('error', function(e) {
- console.log(e);
- });
- </script>
-
- <!-- Target -->
- <textarea id="bar">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
-
- <!-- Trigger -->
- <button class="btn" data-clipboard-action="cut" data-clipboard-target="#bar">
- Cut to clipboard
- </button>
+
+
<?php
// Load non default JS/ECMAScript in footer.
From f6765e93649a997c7bb99aa0ad7fe2189d5e87df Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:52:25 -0400
Subject: [PATCH 88/97] Loki support
---
index.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/index.php b/index.php
index ae71b1e6d..d1a0cd819 100755
--- a/index.php
+++ b/index.php
@@ -171,7 +171,12 @@
<li>
<a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></a>
</li>
- <textarea id="bar">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
+ <div class="row">
+ <div class="form-group col-md-4">
+ <h3>Loki support appreciated</h3>
+ <textarea id="bar">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
+ </div>
+ </div>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.navbar-default -->
From f16ad48a3e9f84808117195fa3f13eaf9c4c79b9 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 20:55:20 -0400
Subject: [PATCH 89/97] scale
---
index.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/index.php b/index.php
index d1a0cd819..f4db48a76 100755
--- a/index.php
+++ b/index.php
@@ -173,7 +173,7 @@
</li>
<div class="row">
<div class="form-group col-md-4">
- <h3>Loki support appreciated</h3>
+ <h6>Independent developer Loki support appreciated</h6>
<textarea id="bar">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
</div>
</div>
From d2c381f0c368e10e6ecc819084a72402563a911e Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 21:03:52 -0400
Subject: [PATCH 90/97] change index
---
index.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/index.php b/index.php
index f4db48a76..57201c5e1 100755
--- a/index.php
+++ b/index.php
@@ -172,9 +172,9 @@
<a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></a>
</li>
<div class="row">
- <div class="form-group col-md-4">
- <h6>Independent developer Loki support appreciated</h6>
- <textarea id="bar">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
+ <div class="col-md-12">
+ <h6>Development support appreciated <span class="badge badge-secondary">Loki</span></h6>
+ <textarea id="text">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
</div>
</div>
</ul>
From abb13483cbd72a9f3cdc81deaa90b3f5a3519d06 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 21:11:48 -0400
Subject: [PATCH 91/97] straight text
---
index.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/index.php b/index.php
index 57201c5e1..bf486d270 100755
--- a/index.php
+++ b/index.php
@@ -173,8 +173,8 @@
</li>
<div class="row">
<div class="col-md-12">
- <h6>Development support appreciated <span class="badge badge-secondary">Loki</span></h6>
- <textarea id="text">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
+ <p class="Development support appreciated">Center-aligned text.</p>
+ <textarea id="textarea">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
</div>
</div>
</ul>
From fbc04bde49b994fbd47a39f69161abcc17cdb2d4 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 21:18:06 -0400
Subject: [PATCH 92/97] other cat
---
index.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/index.php b/index.php
index bf486d270..91499a7e6 100755
--- a/index.php
+++ b/index.php
@@ -171,12 +171,15 @@
<li>
<a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></a>
</li>
+ <a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("Development support appreciated"); ?></a>
+ </ln>
<div class="row">
- <div class="col-md-12">
- <p class="Development support appreciated">Center-aligned text.</p>
+ <div class="span12">
<textarea id="textarea">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
</div>
</div>
+ </div>
+ </div>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.navbar-default -->
From 2551ed27aa77edbc940ae34f71724551ee33f7e0 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 21:24:46 -0400
Subject: [PATCH 93/97] reposition
---
index.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/index.php b/index.php
index 91499a7e6..4144ef21d 100755
--- a/index.php
+++ b/index.php
@@ -171,11 +171,11 @@
<li>
<a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></a>
</li>
- <a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("Development support appreciated"); ?></a>
+ <a href="index.php?page=system_info"><i class="fa fa-mooney fa-fw"></i> <?php echo _("Support appreciated"); ?></a>
</ln>
<div class="row">
<div class="span12">
- <textarea id="textarea">LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</textarea>
+ <h6>LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</h6>
</div>
</div>
</div>
From 0e64534dd1a9bb58a21a50cff2b7a0041d8b9505 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 21:36:46 -0400
Subject: [PATCH 94/97] address relocation
---
includes/system.php | 8 ++++----
index.php | 7 +------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/includes/system.php b/includes/system.php
index f5b23eca2..49e6f9c57 100755
--- a/includes/system.php
+++ b/includes/system.php
@@ -64,14 +64,14 @@ function DisplaySystem(){
if (CSRFValidate()) {
if(isset($_POST['locale'])) {
$_SESSION['locale'] = $_POST['locale'];
- $status->addMessage('Language setting saved', 'success');
+ $status->addMessage('Language setting saved', 'success');
}
} else {
error_log('CSRF violation');
}
}
- // define locales
+ // define locales
$arrLocales = array(
'en_GB.UTF-8' => 'English',
'de_DE.UTF-8' => 'Deutsch',
@@ -173,6 +173,7 @@ function DisplaySystem(){
role="progressbar"
aria-valuenow="<?php echo htmlspecialchars($cpuload, ENT_QUOTES); ?>" aria-valuemin="0" aria-valuemax="100"
style="width: <?php echo htmlspecialchars($cpuload, ENT_QUOTES); ?>%;"><?php echo htmlspecialchars($cpuload, ENT_QUOTES); ?>%
+ <h6><?php echo ("LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf");?></h6>
</div>
</div>
@@ -200,7 +201,7 @@ function DisplaySystem(){
<div role="tabpanel" class="tab-pane" id="console">
<div class="row">
- <div class="col-lg-12">
+ <div class="col-lg-12">
<iframe src="includes/webconsole.php" class="webconsole"></iframe>
</div>
</div>
@@ -220,4 +221,3 @@ function DisplaySystem(){
</div><!-- /.row -->
<?php
}
-
diff --git a/index.php b/index.php
index 4144ef21d..b9138d1fd 100755
--- a/index.php
+++ b/index.php
@@ -171,13 +171,8 @@
<li>
<a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></a>
</li>
- <a href="index.php?page=system_info"><i class="fa fa-mooney fa-fw"></i> <?php echo _("Support appreciated"); ?></a>
+ <a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("Support appreciated"); ?></a>
</ln>
- <div class="row">
- <div class="span12">
- <h6>LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf</h6>
- </div>
- </div>
</div>
</div>
</ul>
From 62e40e1badcd74b9e87e7fedcd619e89ad84825c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 21:38:59 -0400
Subject: [PATCH 95/97] syntax
---
includes/system.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/system.php b/includes/system.php
index 49e6f9c57..58d8e4f52 100755
--- a/includes/system.php
+++ b/includes/system.php
@@ -173,7 +173,7 @@ function DisplaySystem(){
role="progressbar"
aria-valuenow="<?php echo htmlspecialchars($cpuload, ENT_QUOTES); ?>" aria-valuemin="0" aria-valuemax="100"
style="width: <?php echo htmlspecialchars($cpuload, ENT_QUOTES); ?>%;"><?php echo htmlspecialchars($cpuload, ENT_QUOTES); ?>%
- <h6><?php echo ("LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf");?></h6>
+ <h6><?php echo _("LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf"); ?></h6>
</div>
</div>
From c7c37bbc31414451c3a3f90c8a23092c395bec3c Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 21:40:30 -0400
Subject: [PATCH 96/97] 2ns attempt
---
includes/system.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/includes/system.php b/includes/system.php
index 58d8e4f52..2bb8fc1ad 100755
--- a/includes/system.php
+++ b/includes/system.php
@@ -173,7 +173,6 @@ function DisplaySystem(){
role="progressbar"
aria-valuenow="<?php echo htmlspecialchars($cpuload, ENT_QUOTES); ?>" aria-valuemin="0" aria-valuemax="100"
style="width: <?php echo htmlspecialchars($cpuload, ENT_QUOTES); ?>%;"><?php echo htmlspecialchars($cpuload, ENT_QUOTES); ?>%
- <h6><?php echo _("LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf"); ?></h6>
</div>
</div>
@@ -182,6 +181,8 @@ function DisplaySystem(){
<input type="submit" class="btn btn-warning" name="system_shutdown" value="<?php echo _("Shutdown"); ?>" />
<input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
</form>
+ <h6><?php echo _("LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf"); ?></h6>
+
</div>
</div>
</div>
From aa033d4d9262879fb81f06240a84fd85911a5963 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Sun, 17 Mar 2019 21:43:31 -0400
Subject: [PATCH 97/97] clenaup
---
includes/system.php | 5 +++--
index.php | 2 --
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/includes/system.php b/includes/system.php
index 2bb8fc1ad..8bb5c3ae8 100755
--- a/includes/system.php
+++ b/includes/system.php
@@ -181,8 +181,9 @@ function DisplaySystem(){
<input type="submit" class="btn btn-warning" name="system_shutdown" value="<?php echo _("Shutdown"); ?>" />
<input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
</form>
- <h6><?php echo _("LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf"); ?></h6>
-
+ <h5><?php echo _("Development Support Appreciated"); ?></h5>
+ <h5><?php echo _("LK8CGQ17G9R3ys3Xf33wCeViD2B95jgdpjAhcRsjuheJ784dumXn7g3RPAzedWpFq364jJKYL9dkQ8mY66sZG9BiCwrYHPmcZin1VP8Btf"); ?></h5>
+
</div>
</div>
</div>
diff --git a/index.php b/index.php
index b9138d1fd..e55351bb2 100755
--- a/index.php
+++ b/index.php
@@ -171,8 +171,6 @@
<li>
<a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></a>
</li>
- <a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("Support appreciated"); ?></a>
- </ln>
</div>
</div>
</ul>