Add console to Lokinet tab

includes/functions.php

@@ -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>
 
@@ -405,61 +405,27 @@ function DisplayLokinetConfig(){
 						</div>
 					</div>
 				</div>
-				<div class="tab-pane fade" id="relay">
+				<div class="tab-pane fade" id="daemon">
-            		<h4>Relay settings</h4>
+            		<h4>Lokient Daemon</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">
+                  <div class="col-lg-12">
-							<label for="code">RelayBandwidthBurst</label>
+                    <iframe src="includes/webconsole.php" class="webconsole"></iframe>
-							<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" />
+              </div><!-- /.systemtabcontent -->
-				<?php 
+
-				if( $torproxystatus[0] == 0 ) {
+              </div><!-- /.panel-default -->
-					echo '<input type="submit" class="btn btn-success" name="StartTOR" value="Start TOR" />' , PHP_EOL;
+              </div><!-- /.col-md-6 -->
-				} else {
+              </div><!-- /.row -->
-					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>
+            </form>
             </div><!-- /.panel-primary -->
-</div><!-- /.col-lg-12 -->
+            <div class="panel-footer"></div>
-</div><!-- /.row -->
+            </div><!-- /.panel-primary -->
+            </div><!-- /.col-lg-12 -->
+            </div><!-- /.row -->
 <?php
 }