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

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

Revision: 7311
          http://sourceforge.net/p/astlinux/code/7311
Author:   abelbeck
Date:     2015-11-03 14:01:28 +0000 (Tue, 03 Nov 2015)
Log Message:
-----------
web interface, Network tab, move DHCPv6 options into the External Interface section, Thanks Michael

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

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2015-11-03 00:11:36 UTC (rev 7310)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2015-11-03 14:01:28 UTC (rev 7311)
@@ -1363,6 +1363,49 @@
   putHtml('IPv6 Gateway:<input type="text" size="38" maxlength="39" value="'.$value.'" name="gateway_ipv6" /></td></tr>');
   
   putHtml('<tr class="dtrow1"><td class="dialogText" style="text-align: left;" colspan="6">');
+  putHtml('<strong>External DHCPv6 Client Settings:</strong>');
+  putHtml('</td></tr>');
+
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
+  $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_ADDRESS', $cur_db);
+  putHtml('DHCPv6 Client Address:');
+  putHtml('<select name="dhcpv6_client_request_address">');
+  putHtml('<option value="no">disabled</option>');
+  $sel = ($value !== 'no') ? ' selected="selected"' : '';
+  putHtml('<option value="yes"'.$sel.'>enabled</option>');
+  putHtml('</select></td>');
+  putHtml('<td style="text-align: left;" colspan="3">');
+  if (($dhcpv6_client_prefix_len = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_LEN', $cur_db)) === '') {
+    $dhcpv6_client_prefix_len = '60';
+  }
+  putHtml('DHCPv6 Prefix Length:');
+  putHtml('<select name="dhcpv6_client_prefix_len">');
+  foreach ($select_dhcpv6_prefix_len as $key => $value) {
+    $sel = ($dhcpv6_client_prefix_len == $value) ? ' selected="selected"' : '';
+    putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
+  }
+  putHtml('</select>');
+  putHtml('</td></tr>');
+
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
+  $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_PREFIX', $cur_db);
+  putHtml('DHCPv6 Prefix Delegation:');
+  putHtml('<select name="dhcpv6_client_request_prefix">');
+  putHtml('<option value="no">disabled</option>');
+  $sel = ($value !== 'no') ? ' selected="selected"' : '';
+  putHtml('<option value="yes"'.$sel.'>enabled</option>');
+  putHtml('</select></td>');
+  putHtml('<td style="text-align: left;" colspan="3">');
+  $value = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_HINT', $cur_db);
+  putHtml('DHCPv6 Prefix Length Hint:');
+  putHtml('<select name="dhcpv6_client_prefix_hint">');
+  putHtml('<option value="no">disabled</option>');
+  $sel = ($value !== 'no') ? ' selected="selected"' : '';
+  putHtml('<option value="yes"'.$sel.'>enabled</option>');
+  putHtml('</select>');
+  putHtml('</td></tr>');
+
+  putHtml('<tr class="dtrow1"><td class="dialogText" style="text-align: left;" colspan="6">');
   putHtml('<strong>External PPPoE Settings:</strong>');
   putHtml('</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
@@ -1881,51 +1924,6 @@
   putHtml('<tr class="dtrow0"><td colspan="6">&nbsp;</td></tr>');
   
   putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
-  putHtml('<strong>IPv6 DHCPv6 Client Options:</strong>');
-  putHtml('</td></tr>');
-
-  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
-  $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_ADDRESS', $cur_db);
-  putHtml('DHCPv6 Client Address:');
-  putHtml('<select name="dhcpv6_client_request_address">');
-  putHtml('<option value="no">disabled</option>');
-  $sel = ($value !== 'no') ? ' selected="selected"' : '';
-  putHtml('<option value="yes"'.$sel.'>enabled</option>');
-  putHtml('</select></td>');
-  putHtml('<td style="text-align: left;" colspan="3">');
-  if (($dhcpv6_client_prefix_len = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_LEN', $cur_db)) === '') {
-    $dhcpv6_client_prefix_len = '60';
-  }
-  putHtml('DHCPv6 Prefix Length:');
-  putHtml('<select name="dhcpv6_client_prefix_len">');
-  foreach ($select_dhcpv6_prefix_len as $key => $value) {
-    $sel = ($dhcpv6_client_prefix_len == $value) ? ' selected="selected"' : '';
-    putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
-  }
-  putHtml('</select>');
-  putHtml('</td></tr>');
-
-  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
-  $value = getVARdef($db, 'DHCPV6_CLIENT_REQUEST_PREFIX', $cur_db);
-  putHtml('DHCPv6 Prefix Delegation:');
-  putHtml('<select name="dhcpv6_client_request_prefix">');
-  putHtml('<option value="no">disabled</option>');
-  $sel = ($value !== 'no') ? ' selected="selected"' : '';
-  putHtml('<option value="yes"'.$sel.'>enabled</option>');
-  putHtml('</select></td>');
-  putHtml('<td style="text-align: left;" colspan="3">');
-  $value = getVARdef($db, 'DHCPV6_CLIENT_PREFIX_HINT', $cur_db);
-  putHtml('DHCPv6 Prefix Length Hint:');
-  putHtml('<select name="dhcpv6_client_prefix_hint">');
-  putHtml('<option value="no">disabled</option>');
-  $sel = ($value !== 'no') ? ' selected="selected"' : '';
-  putHtml('<option value="yes"'.$sel.'>enabled</option>');
-  putHtml('</select>');
-  putHtml('</td></tr>');
-
-  putHtml('<tr class="dtrow0"><td colspan="6">&nbsp;</td></tr>');
-  
-  putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
   putHtml('<strong>IPv6 Tunnel (6in4, 6to4):</strong>');
   putHtml('</td></tr>');
   

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