From eed50706d9148ed42bc15867be35db4ea626478c Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Sat, 5 Jun 2021 12:20:58 +0100
Subject: [PATCH] Fixup template merge from upstream master

---
 templates/openvpn.php | 59 -------------------------------------------
 1 file changed, 59 deletions(-)

diff --git a/templates/openvpn.php b/templates/openvpn.php
index 40e084e8..4e0adaba 100755
--- a/templates/openvpn.php
+++ b/templates/openvpn.php
@@ -46,65 +46,6 @@
 
             <?php echo $buttons ?>
           </form>
-              <div class="tab-pane active" id="openvpnclient">
-                <h4 class="mt-3"><?php echo _("Client settings"); ?></h4>
-                <div class="row">
-                  <div class="col">
-                    <div class="row mb-2">
-                      <div class="col-lg-12 mt-2 mb-2">
-                        <div class="row ml-1">
-                          <div class="info-item col-xs-3"><?php echo _("IPv4 Address"); ?></div>
-                          <div class="info-value col-xs-3"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
-                        </div>
-                      </div>
-                    </div>
-                      <div class="row">
-                     <div class="form-group col-lg-12">
-                      <label for="code"><?php echo _("Username"); ?></label>
-                        <input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" />
-                      </div>
-                    </div>
-                    <div class="row">
-                      <div class="form-group col-lg-12">
-                        <label for="code"><?php echo _("Password"); ?></label>
-                        <input type="password" class="form-control" name="authPassword" value="<?php echo htmlspecialchars($authPassword, ENT_QUOTES); ?>" />
-                      </div>
-                    </div>
-                    <div class="row">
-                      <div class="form-group col-lg-12">
-                        <div class="custom-file">
-                          <input type="file" class="custom-file-input" name="customFile" id="customFile">
-                          <label class="custom-file-label" for="customFile"><?php echo _("Select OpenVPN configuration file (.ovpn)"); ?></label>
-                        </div>
-                      </div>
-                    </div>
-                  </div><!-- col-->
-                  <div class="col-sm">
-                      <a href="https://go.nordvpn.net/aff_c?offer_id=15&aff_id=36402&url_id=902"><img src="app/img/no-trace-200x200.png" class="float-left mb-3 mt-3"></a>
-                  </div>
-                </div><!-- main row -->
-              </div>
-              <div class="tab-pane fade" id="openvpnlogoutput">
-                <h4 class="mt-3"><?php echo _("Client log"); ?></h4>
-                <div class="row">
-                  <div class="form-group col-md-8">
-                    <?php
-                        echo '<textarea class="logoutput"></textarea>';
-                    ?>
-                  </div>
-                </div>
-              </div>
-              <?php if (!RASPI_MONITOR_ENABLED) : ?>
-                  <input type="submit" class="btn btn-outline btn-primary" name="SaveOpenVPNSettings" value="Save settings" />
-                  <?php if ($openvpnstatus[0] == 0) {
-                      echo '<input type="submit" class="btn btn-success" name="StartOpenVPN" value="Start OpenVPN" />' , PHP_EOL;
-                    } else {
-                      echo '<input type="submit" class="btn btn-warning" name="StopOpenVPN" value="Stop OpenVPN" />' , PHP_EOL;
-                    }
-                  ?>
-              <?php endif ?>
-              </form>
-            </div>
         </div><!-- /.card-body -->
       <div class="card-footer"><?php echo _("Information provided by openvpn"); ?></div>
     </div><!-- /.card -->