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

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

Revision: 6029
          http://astlinux.svn.sourceforge.net/astlinux/?rev=6029&view=rev
Author:   abelbeck
Date:     2013-03-30 18:51:11 +0000 (Sat, 30 Mar 2013)
Log Message:
-----------
web interface, Firewall tab, Traffic Shaping - Downlink Speed, set 'Disabled' by default and clarify

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/firewall.php
    branches/1.0/package/webinterface/altweb/common/license-packages.txt

Modified: branches/1.0/package/webinterface/altweb/admin/firewall.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/firewall.php	2013-03-30 13:55:16 UTC (rev 6028)
+++ branches/1.0/package/webinterface/altweb/admin/firewall.php	2013-03-30 18:51:11 UTC (rev 6029)
@@ -317,7 +317,10 @@
     fwrite($fp, "### Traffic Shaping\n");
     $value = 'SHAPETYPE="'.$_POST['shaper_enable_type'].'"';
     fwrite($fp, $value."\n");
-    $value = 'EXTDOWN="'.tuq($_POST['shaper_extdown']).'"';
+    if (($value = tuq($_POST['shaper_extdown'])) === '' || $_POST['shaper_extdown_enable'] === 'no') {
+      $value = '0';
+    }
+    $value = 'EXTDOWN="'.$value.'"';
     fwrite($fp, $value."\n");
     $value = 'EXTUP="'.tuq($_POST['shaper_extup']).'"';
     fwrite($fp, $value."\n");
@@ -915,11 +918,17 @@
   putHtml('<tr class="dtrow1"><td width="175" style="text-align: right;">');
   putHtml('Downlink Speed:');
   putHtml('</td><td style="text-align: left;">');
-  if (($value = getVARdef($vars, 'EXTDOWN')) === '') {
-    $value = '4000';
+  if ((int)($value = getVARdef($vars, 'EXTDOWN')) == 0) {
+    $value = '';
   }
   putHtml('<input type="text" size="8" maxlength="6" value="'.$value.'" name="shaper_extdown" />');
-  putHtml('K bits-per-second</td></tr>');
+  putHtml('<select name="shaper_extdown_enable">');
+  $sel = ($value === '') ? ' selected="selected"' : '';
+  putHtml('<option value="no"'.$sel.'>Disabled</option>');
+  $sel = ($value !== '') ? ' selected="selected"' : '';
+  putHtml('<option value="yes"'.$sel.'>K bits-per-second</option>');
+  putHtml('</select>');
+  putHtml('</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   putHtml('Uplink Speed:');
   putHtml('</td><td style="text-align: left;">');
@@ -927,12 +936,15 @@
     $value = '800';
   }
   putHtml('<input type="text" size="8" maxlength="6" value="'.$value.'" name="shaper_extup" />');
-  putHtml('K bits-per-second</td></tr>');
+  putHtml('<select name="shaper_extup_enable">');
+  putHtml('<option value="yes">K bits-per-second</option>');
+  putHtml('</select>');
+  putHtml('</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   putHtml('VoIP UDP Ports:');
   putHtml('</td><td style="text-align: left;">');
   if (($value = getVARdef($vars, 'VOIPPORTS')) === '') {
-    $value = '4569 16384:16639';
+    $value = '16384:16639';
   }
   putHtml('<input type="text" size="56" maxlength="128" value="'.$value.'" name="shaper_voipports" />');
   putHtml('</td></tr>');

Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license-packages.txt	2013-03-30 13:55:16 UTC (rev 6028)
+++ branches/1.0/package/webinterface/altweb/common/license-packages.txt	2013-03-30 18:51:11 UTC (rev 6029)
@@ -38,6 +38,7 @@
 SILK CODEC~Copyright (c) 2010-2012 Skype and/or Microsoft. All rights reserved. Licensed via Digium, Inc.
 SpanDSP~Copyright (c) 2003-2012 Steve Underwood <st...@co...>. All rights reserved.
 Prosody~Copyright (c) 2008-2010 Matthew Wild and Waqas Hussain.
+clix~Copyright (c) 2008-2013 Matthew Wild.
 Lua~Copyright (c) 1994-2012 Lua.org, PUC-Rio.  All rights reserved.
 perl~Copyright (c) 1987-2012 by Larry Wall, et al.
 phpliteadmin~Copyright (c) 2011-2013 phpLiteAdmin (http://phpliteadmin.googlecode.com)

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