From 20d2443468aea115a35d9bd5ccf13a8bf1212308 Mon Sep 17 00:00:00 2001
From: Christian Zeitnitz <christian@zeitnitz.eu>
Date: Wed, 31 Mar 2021 12:48:31 +0200
Subject: [PATCH 1/2] Fix panel title for certificate option

---
 templates/openvpn/general.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/openvpn/general.php b/templates/openvpn/general.php
index 7a33163d..21262db1 100644
--- a/templates/openvpn/general.php
+++ b/templates/openvpn/general.php
@@ -37,9 +37,8 @@
            <div class="panel panel-default panel-collapse collapse in" id="PanelCerts" >
               <div class="panel-body">
              <div class="panel-heading">
-               <h5 class="panel-title">Enter username and password</h5>
+               <h5 class="panel-title">Certificates in the configuration file</h5>
              </div>
-                    <h5 class="panel-title">Certificates in the configuration file</h5>
                     <p> RaspAP does not support the import of the required cerficates. Please paste them into the configuration file
                       <ul>
                         <li>Signing certification authority (CA) certificate (e.g. <code>ca.crt</code>): enclosed in <code>&lt;ca> ... &lt;/ca></code> tags </li>

From fc83727408d9948c244954edea1fe9d04f17eb45 Mon Sep 17 00:00:00 2001
From: Christian Zeitnitz <christian@zeitnitz.eu>
Date: Wed, 31 Mar 2021 12:54:43 +0200
Subject: [PATCH 2/2] Use client.conf to get path and name of configuration

---
 ajax/openvpn/activate_ovpncfg.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ajax/openvpn/activate_ovpncfg.php b/ajax/openvpn/activate_ovpncfg.php
index b8f822c2..2a8542a9 100644
--- a/ajax/openvpn/activate_ovpncfg.php
+++ b/ajax/openvpn/activate_ovpncfg.php
@@ -5,11 +5,11 @@ require_once '../../includes/functions.php';
 
 if (isset($_POST['cfg_id'])) {
     $ovpncfg_id = $_POST['cfg_id'];
-    $ovpncfg_path = pathinfo(RASPI_OPENVPN_CLIENT_LOGIN, PATHINFO_DIRNAME).'/';
+    $ovpncfg_path = pathinfo(RASPI_OPENVPN_CLIENT_CONFIG, PATHINFO_DIRNAME).'/';
     $ovpncfg_files = $ovpncfg_path .$ovpncfg_id.'_*.conf';
 
     // move currently active profile
-    $meta = file_get_meta(RASPI_OPENVPN_CLIENT_LOGIN,'#\sfilename\s(.*)');
+    $meta = file_get_meta(RASPI_OPENVPN_CLIENT_CONFIG,'#\sfilename\s(.*)');
     $ovpncfg_client = $ovpncfg_path .$meta.'_client.conf';
     $ovpncfg_login = $ovpncfg_path .$meta.'_login.conf';
     exec("sudo mv ".RASPI_OPENVPN_CLIENT_CONFIG." $ovpncfg_client", $return);