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

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

Revision: 7303
          http://sourceforge.net/p/astlinux/code/7303
Author:   abelbeck
Date:     2015-11-02 16:51:20 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
web interface, add support for Connection Type: [Static IPv4/DHCPv6]

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

Modified: branches/1.0/package/webinterface/altweb/admin/failover.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/failover.php	2015-11-02 15:51:26 UTC (rev 7302)
+++ branches/1.0/package/webinterface/altweb/admin/failover.php	2015-11-02 16:51:20 UTC (rev 7303)
@@ -148,7 +148,7 @@
   }
   fwrite($fp, "### Static IPv4 Gateway\n".$value."\n");
 
-  if ($_POST['ip_type'] === 'dhcp-dhcpv6') {
+  if ($_POST['ip_type'] === 'dhcp-dhcpv6' || $_POST['ip_type'] === 'static-dhcpv6') {
     $value = 'EXT2DHCPV6_CLIENT_ENABLE="yes"';
   } else {
     $value = 'EXT2DHCPV6_CLIENT_ENABLE="no"';
@@ -404,8 +404,10 @@
   putHtml('<option value="dhcp">DHCP</option>');
   $sel = (getVARdef($db, 'EXT2IP', $cur_db) === '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
   putHtml('<option value="dhcp-dhcpv6"'.$sel.'>DHCP/DHCPv6</option>');
-  $sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '') ? ' selected="selected"' : '';
+  $sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) !== 'yes') ? ' selected="selected"' : '';
   putHtml('<option value="static"'.$sel.'>Static IP</option>');
+  $sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
+  putHtml('<option value="static-dhcpv6"'.$sel.'>Static IPv4/DHCPv6</option>');
   putHtml('</select>');
   putHtml('</td></tr>');
 

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2015-11-02 15:51:26 UTC (rev 7302)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2015-11-02 16:51:20 UTC (rev 7303)
@@ -230,7 +230,7 @@
   }
   fwrite($fp, "### External Static IPv4 Gateway\n".$value."\n");
 
-  if ($_POST['ip_type'] === 'dhcp-dhcpv6') {
+  if ($_POST['ip_type'] === 'dhcp-dhcpv6' || $_POST['ip_type'] === 'static-dhcpv6') {
     $value = 'DHCPV6_CLIENT_ENABLE="yes"';
   } else {
     $value = 'DHCPV6_CLIENT_ENABLE="no"';
@@ -1110,7 +1110,7 @@
     } elseif ($result == 10) {
       putHtml('<p style="color: green;">System is Rebooting... back in <span id="count_down"><script language="JavaScript" type="text/javascript">document.write(count_down_secs);</script></span> seconds.</p>');
     } elseif ($result == 11) {
-      putHtml('<p style="color: green;">Settings saved, click "Reboot/Restart" to apply any changed settings.</p>');
+      putHtml('<p style="color: green;">Settings saved, click "Reboot/Restart" to apply any changed settings, a "Reboot System" is required for Interface changes.</p>');
     } elseif ($result == 21) {
       putHtml('<p style="color: green;">PPPoE has Restarted.</p>');
     } elseif ($result == 22) {
@@ -1307,8 +1307,10 @@
   putHtml('<option value="dhcp">DHCP</option>');
   $sel = (getVARdef($db, 'EXTIP', $cur_db) === '' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
   putHtml('<option value="dhcp-dhcpv6"'.$sel.'>DHCP/DHCPv6</option>');
-  $sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0') ? ' selected="selected"' : '';
+  $sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) !== 'yes') ? ' selected="selected"' : '';
   putHtml('<option value="static"'.$sel.'>Static IP</option>');
+  $sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
+  putHtml('<option value="static-dhcpv6"'.$sel.'>Static IPv4/DHCPv6</option>');
   $sel = (getVARdef($db, 'EXTIF', $cur_db) === 'ppp0') ? ' selected="selected"' : '';
   putHtml('<option value="pppoe"'.$sel.'>PPPoE</option>');
   putHtml('</select>');

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