From 5f0f67a13075b91d416891679b8e9486817f09d1 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Tue, 12 Jul 2016 22:27:14 +0200
Subject: [PATCH 1/3] some fixes for vpn_openvpn_export.php

---
 src/www/vpn_openvpn_export.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index 18b7fe489..20bb7e3ae 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -490,9 +490,9 @@ if (isset($savemsg)) {
                         <?=gettext("Use a password to protect the pkcs12 file contents or key in Viscosity bundle.");?>
                       </div>
                       <div id="usepass_opts" style="display:none">
-                        <label ><?=gettext("Password :");?></label>
+                        <label for="pass"><?=gettext("Password:");?></label>
                         <input name="pass" id="pass" class="form-control" type="password" value="" />
-                        <label ><?=gettext("Confirm :");?></label>
+                        <label for="conf"><?=gettext("Confirm:");?></label>
                         <input name="conf" id="conf" class="form-control" type="password" value="" />
                       </div>
                 </td>
@@ -502,31 +502,31 @@ if (isset($savemsg)) {
                 <td >
                       <input name="useproxy" id="useproxy" type="checkbox" value="yes" />
                       <div class="hidden" for="help_for_http_proxy">
-                        <?=gettext("Use proxy to communicate with the server.");?>
+                        <?=gettext("Use a proxy to communicate with the server.");?>
                       </div>
                       <div id="useproxy_opts" style="display:none" >
-                        <?=gettext("Type");?>
+                        <label for="useproxytype"><?=gettext("Type:");?></label>
                         <select name="useproxytype" id="useproxytype" class="formselect">
                           <option value="http"><?=gettext("HTTP");?></option>
                           <option value="socks"><?=gettext("SOCKS");?></option>
                         </select>
-                        <?=gettext("IP Address");?>
+                        <label for="proxyaddr"><?=gettext("IP Address");?></label>
                         <input name="proxyaddr" id="proxyaddr" type="text" class="formfld unknown" size="30" value="" />
-                        <?=gettext("Port");?> :
+                        <label for="proxyport"><?=gettext("Port:");?></label>
                         <input name="proxyport" id="proxyport" type="text" class="formfld unknown" size="5" value="" />
                         <div>
-                            <?=gettext("Choose proxy authentication if any.");?>
+                          <label for="useproxypass"><?=gettext("Choose proxy authentication if any.");?></label>
                           <select name="useproxypass" id="useproxypass" class="formselect">
                             <option value="none"><?=gettext("none");?></option>
                             <option value="basic"><?=gettext("basic");?></option>
                             <option value="ntlm"><?=gettext("ntlm");?></option>
                           </select>
                           <div id="useproxypass_opts" style="display:none">
-                            <label><?=gettext("Username");?> :</label>
+                            <label for="proxyuser"><?=gettext("Username:");?></label>
                             <input name="proxyuser" id="proxyuser" type="text" class="formfld unknown" value="" />
-                            <label><?=gettext("Password");?> :</label>
+                            <label for="proxypass"><?=gettext("Password:");?></label>
                             <input name="proxypass" id="proxypass" type="password" class="form-control" value="" />
-                            <label><?=gettext("Confirm");?> :</label>
+                            <label for="proxyconf"><?=gettext("Confirm:");?></label>
                             <input name="proxyconf" id="proxyconf" type="password" class="form-control" value="" />
                           </div>
                         </div>
@@ -686,7 +686,7 @@ if (isset($savemsg)) {
                     <div class="hidden" for="help_for_clientpkg">
                       <br/>
                       <?= gettext("NOTES:") ?> <br/>
-                      <?= gettext("The &quot;XP&quot; Windows installers work on Windows XP and later versions. The &quot;win6&quot; Windows installers include a new tap-windows6 driver that works only on Windows Vista and later.") ?><br/>
+                      <?= gettext('The "XP" Windows installers work on Windows XP and later versions. The "win6" Windows installers include a new tap-windows6 driver that works only on Windows Vista and later.') ?><br/>
                       <br/><br/>
                       <strong><?= gettext("Links to OpenVPN clients for various platforms:") ?></strong><br/>
                       <a href="http://openvpn.net/index.php/open-source/downloads.html"><?= gettext("OpenVPN Community Client") ?></a> - <?=gettext("Binaries for Windows, Source for other platforms. Packaged above in the Windows Installers")?><br/>

From abc4a81c14e13e0963ca1cc74d3a8f4258a353a1 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Tue, 12 Jul 2016 22:41:34 +0200
Subject: [PATCH 2/3] fix last commit

---
 src/www/vpn_openvpn_export.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index 20bb7e3ae..b85224db5 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -526,7 +526,7 @@ if (isset($savemsg)) {
                             <input name="proxyuser" id="proxyuser" type="text" class="formfld unknown" value="" />
                             <label for="proxypass"><?=gettext("Password:");?></label>
                             <input name="proxypass" id="proxypass" type="password" class="form-control" value="" />
-                            <label for="proxyconf"><?=gettext("Confirm:");?></label>
+                            <label for="proxyconf"><?=gettext("Confirmation:");?></label>
                             <input name="proxyconf" id="proxyconf" type="password" class="form-control" value="" />
                           </div>
                         </div>

From c6fc9b3e2c6f1224d2c3c2dc110708b4a70bd36e Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Tue, 12 Jul 2016 22:45:07 +0200
Subject: [PATCH 3/3] fix last commit

---
 src/www/vpn_openvpn_export.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index b85224db5..a552d460f 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -492,7 +492,7 @@ if (isset($savemsg)) {
                       <div id="usepass_opts" style="display:none">
                         <label for="pass"><?=gettext("Password:");?></label>
                         <input name="pass" id="pass" class="form-control" type="password" value="" />
-                        <label for="conf"><?=gettext("Confirm:");?></label>
+                        <label for="conf"><?=gettext("Confirmation:");?></label>
                         <input name="conf" id="conf" class="form-control" type="password" value="" />
                       </div>
                 </td>