[Astlinux-commits] SF.net SVN: astlinux:[8230] branches/1.0/package/webinterface/altweb/admin /openvpnclient.php

[<abe...@us...>]

Revision: 8230
          http://sourceforge.net/p/astlinux/code/8230
Author:   abelbeck
Date:     2017-03-24 20:37:28 +0000 (Fri, 24 Mar 2017)
Log Message:
-----------
web interface, OpenVPN Client, generate OVPNC_REMOTE_CERT_TLS instead of the deprecated OVPNC_NSCERTTYPE

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/openvpnclient.php

Modified: branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpnclient.php	2017-03-24 16:57:24 UTC (rev 8229)
+++ branches/1.0/package/webinterface/altweb/admin/openvpnclient.php	2017-03-24 20:37:28 UTC (rev 8230)
@@ -11,6 +11,7 @@
 // 08-13-2010, Added QoS Passthrough, setting passtos
 // 02-13-2013, Added OpenVPN 2.3 IPv6 support
 // 02-23-2013, Added User/Pass support
+// 03-24-2017, Change from OVPNC_NSCERTTYPE to OVPNC_REMOTE_CERT_TLS
 //
 // System location of /mnt/kd/rc.conf.d directory
 $OVPNCONFDIR = '/mnt/kd/rc.conf.d';
@@ -129,7 +130,7 @@
   }
   fwrite($fp, "### Auth User/Pass\n".$value."\n");
   
-  $value = 'OVPNC_NSCERTTYPE="'.$_POST['nscerttype'].'"';
+  $value = 'OVPNC_REMOTE_CERT_TLS="'.$_POST['nscerttype'].'"';
   fwrite($fp, "### nsCertType\n".$value."\n");
   
   $value = 'OVPNC_REMOTE="'.tuq($_POST['remote']).'"';
@@ -455,9 +456,11 @@
   putHtml('</td></tr>');
 
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
-  putHtml('Require nsCertType:');
+  putHtml('Require TLS Cert:');
   putHtml('</td><td style="text-align: left;" colspan="4">');
-  $nscerttype = getVARdef($db, 'OVPNC_NSCERTTYPE');
+  if (($nscerttype = getVARdef($db, 'OVPNC_REMOTE_CERT_TLS')) === '') {
+    $nscerttype = getVARdef($db, 'OVPNC_NSCERTTYPE');
+  }
   putHtml('<select name="nscerttype">');
   foreach ($nscerttype_menu as $key => $value) {
     $sel = ($nscerttype === $key) ? ' selected="selected"' : '';
@@ -464,6 +467,7 @@
     putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
   }
   putHtml('</select>');
+  putHtml('<i>(nsCertType)</i>');
   putHtml('</td></tr>');
 
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.