From e30d1596dce7070c6d5f1b84acf81ab2d48deb62 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 14 Nov 2019 12:30:24 +0000
Subject: [PATCH] Update openvpn template w/ focus on client UI

---
 templates/openvpn.php | 76 ++++++++++++++-----------------------------
 1 file changed, 24 insertions(+), 52 deletions(-)

diff --git a/templates/openvpn.php b/templates/openvpn.php
index 212a4d27..8085741d 100755
--- a/templates/openvpn.php
+++ b/templates/openvpn.php
@@ -5,8 +5,8 @@
         <div class="card-body">
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
-                <li class="nav-item"><a class="nav-link active" href="#openvpnclient" data-toggle="tab">Client settings</a></li>
-                <li class="nav-item"><a class="nav-link" href="#openvpnserver" data-toggle="tab">Server settings</a></li>
+                <li class="nav-item"><a class="nav-link active" id="clienttab" href="#openvpnclient" data-toggle="tab"><?php echo _("Client settings"); ?></a></li>
+                <li class="nav-item"><a class="nav-link" id="logoutputtab" href="#openvpnlogoutput" data-toggle="tab"><?php echo _("Logfile output"); ?></a></li>
             </ul>
             <!-- Tab panes -->
             <div class="tab-content">
@@ -16,6 +16,18 @@
                     <form role="form" action="?page=save_hostapd_conf" method="POST">
                     <?php echo CSRFTokenFieldTag() ?>
 
+                    <div class="row">
+					  <div class="form-group col-md-6">
+						  <label for="code"><?php echo _("Username"); ?></label>
+						  <input type="text" class="form-control" name="Username" value="<?php echo htmlspecialchars($Username, ENT_QUOTES); ?>" />
+					  </div>
+					</div>
+                    <div class="row">
+					  <div class="form-group col-md-6">
+						  <label for="code"><?php echo _("Password"); ?></label>
+						  <input type="password" class="form-control" name="Password" value="<?php echo htmlspecialchars($Password, ENT_QUOTES); ?>" />
+					  </div>
+					</div>
                     <div class="row">
                         <div class="form-group col-md-6">
                           <div class="custom-file">
@@ -24,57 +36,17 @@
                           </div>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="form-group col-md-6">
-                            <label for="code">Client Log</label>
-                            <input type="text" class="form-control" id="disabledInput" name="log-append" type="text" placeholder="<?php echo htmlspecialchars($arrClientConfig['log-append'], ENT_QUOTES); ?>" disabled="disabled" />
-                        </div>
-                    </div>
                 </div>
-                <div class="tab-pane fade" id="openvpnserver">
-                    <h4>Server settings</h4>
-                    <div class="row">
-                        <div class="form-group col-md-6">
-                        <label for="code">Port</label> 
-                        <input type="text" class="form-control" name="openvpn_port" value="<?php echo htmlspecialchars($arrServerConfig['port'], ENT_QUOTES); ?>" />
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-6">
-                        <label for="code">Protocol</label>
-                        <input type="text" class="form-control" name="openvpn_proto" value="<?php echo htmlspecialchars($arrServerConfig['proto'], ENT_QUOTES); ?>" />
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-6">
-                        <label for="code">Root CA certificate</label>
-                        <input type="text" class="form-control" name="openvpn_rootca" placeholder="<?php echo htmlspecialchars($arrServerConfig['ca'], ENT_QUOTES); ?>" disabled="disabled" />
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-6">
-                        <label for="code">Server certificate</label>
-                        <input type="text" class="form-control" name="openvpn_cert" placeholder="<?php echo htmlspecialchars($arrServerConfig['cert'], ENT_QUOTES); ?>" disabled="disabled" />
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-6">
-                        <label for="code">Diffie Hellman parameters</label>
-                        <input type="text" class="form-control" name="openvpn_dh" placeholder="<?php echo htmlspecialchars($arrServerConfig['dh'], ENT_QUOTES); ?>" disabled="disabled" />
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-6">
-                        <label for="code">KeepAlive</label>
-                        <input type="text" class="form-control" name="openvpn_keepalive" value="<?php echo htmlspecialchars($arrServerConfig['keepalive'], ENT_QUOTES); ?>" />
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="form-group col-md-6">
-                        <label for="code">Server log</label>
-                        <input type="text" class="form-control" name="openvpn_status" placeholder="<?php echo htmlspecialchars($arrServerConfig['status'], ENT_QUOTES); ?>" disabled="disabled" />
-                        </div>
-                    </div>
+                <div class="tab-pane fade" id="openvpnlogoutput">
+				  <h4><?php echo _("Client log"); ?></h4>
+				  <div class="row">
+					<div class="form-group col-md-8">
+					  <?php
+						  $log = file_get_contents('/tmp/hostapd.log');
+						  echo '<br /><textarea class="logoutput">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
+					  ?>
+					</div>
+				  </div>
                 </div>
                 <input type="submit" class="btn btn-outline btn-primary" name="SaveOpenVPNSettings" value="Save settings" />
                 <?php