[Astlinux-commits] SF.net SVN: astlinux:[6992] branches/1.0/package/webinterface/altweb

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

Revision: 6992
          http://sourceforge.net/p/astlinux/code/6992
Author:   abelbeck
Date:     2015-02-28 16:19:59 +0000 (Sat, 28 Feb 2015)
Log Message:
-----------
web interface, Status and Network tab, change NAT-PMP to NAT-PMP/PCP labels for latest MiniUPnP

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/network.php
    branches/1.0/package/webinterface/altweb/common/status.inc

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2015-02-28 14:20:12 UTC (rev 6991)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2015-02-28 16:19:59 UTC (rev 6992)
@@ -114,9 +114,9 @@
 
 $select_upnp = array (
   'disabled' => 'no:no',
-  'NAT-PMP only' => 'yes:no',
+  'NAT-PMP/PCP only' => 'yes:no',
   'UPnP only' => 'no:yes',
-  'NAT-PMP & UPnP' => 'yes:yes'
+  'NAT-PMP/PCP & UPnP' => 'yes:yes'
 );
 
 // Function: checkNETWORKsettings
@@ -441,7 +441,7 @@
   $x_value = $_POST['upnp'];
   $tokens = explode(':', $x_value);
   $value = 'UPNP_ENABLE_NATPMP="'.$tokens[0].'"';
-  fwrite($fp, "### UPnP NAT-PMP\n".$value."\n");
+  fwrite($fp, "### UPnP NAT-PMP/PCP\n".$value."\n");
   $value = 'UPNP_ENABLE_UPNP="'.$tokens[1].'"';
   fwrite($fp, "### UPnP Enable\n".$value."\n");
 
@@ -1148,9 +1148,9 @@
       case 1:
       case 2:
       case 3:
-        alert('WARNING: Enabling either NAT-PMP or UPnP has security implications!\
+        alert('WARNING: Enabling either NAT-PMP/PCP or UPnP has security implications!\
 \n\nNAT EXT->LAN rules can be created automatically.\
-\n\nIf you must, try NAT-PMP only.');
+\n\nIf you must, try NAT-PMP/PCP only.');
         break;
     }
   }

Modified: branches/1.0/package/webinterface/altweb/common/status.inc
===================================================================
--- branches/1.0/package/webinterface/altweb/common/status.inc	2015-02-28 14:20:12 UTC (rev 6991)
+++ branches/1.0/package/webinterface/altweb/common/status.inc	2015-02-28 16:19:59 UTC (rev 6992)
@@ -723,11 +723,11 @@
 
 if ($daemon['miniupnpd'] > 0) {
   if (getPREFdef($global_prefs, 'status_show_miniupnpd_leases') !== 'no') { // currently not set in the Prefs tab
-    putHtml("<h2>Universal Plug'n'Play (NAT-PMP and UPnP) Leases:</h2>");
+    putHtml("<h2>Universal Plug'n'Play (NAT-PMP/PCP and UPnP) Leases:</h2>");
   
     if (is_null($upnp = parseMINIUPNPDleases($MINIUPNPDLEASES))) {
       putHtml("<pre>");
-      putText('No Active NAT-PMP or UPnP Leases');
+      putText('No Active NAT-PMP/PCP or UPnP Leases');
       putHtml("</pre>");
     } else {
       putHtml('<pre><table class="statusdatatable">');

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