diff options
author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-04-04 10:42:48 -0300 |
---|---|---|
committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-04-04 10:42:48 -0300 |
commit | f599d893fff3d78f44068dc3ba238046d933ddb1 (patch) | |
tree | e4b2c4707df823ca6b9cabeb25fe908f9caa531b /usr/local | |
parent | 7de4284cffe27ed6b1f4335dd39b31cd3f852321 (diff) | |
parent | 1309faddc84d101fb0ecba85782d97b04a2a1a9f (diff) | |
download | pfsense-f599d893fff3d78f44068dc3ba238046d933ddb1.zip pfsense-f599d893fff3d78f44068dc3ba238046d933ddb1.tar.gz |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/shaper.inc
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/firewall_shaper.php | 5 | ||||
-rw-r--r-- | usr/local/www/status_rrd_graph_img.php | 3 | ||||
-rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 12 |
3 files changed, 9 insertions, 11 deletions
diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index f3cdbab..407c947 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -386,11 +386,8 @@ include("head.inc"); <link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <script type="text/javascript" src="./tree/tree.js"></script> <?php -if ($queue) { - echo "<script type=\"text/javascript\">"; +if ($queue) echo $queue->build_javascript(); - echo "</script>"; -} echo $newjavascript; include("fbegin.inc"); diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 22802bc..b2d9cbb 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -315,7 +315,8 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas $graphcmd .= "CDEF:\"$curif-bytes_t=$curif-bytes_in_t_pass,$curif-bytes_out_t_block,+\" "; $graphcmd .= "VDEF:\"$curif-in_bits_95=$curif-in_bits,95,PERCENT\" "; - $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT\" "; + $graphcmd .= "CDEF:\"$curif-out_bits_mul=$curif-out_bits,$multiplier,*\" "; + $graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits_mul,95,PERCENT\" "; $graphcmd .= "AREA:\"$curif-in_bits_block#{$colortrafficdown[1]}:$curif-in-block\" "; $graphcmd .= "AREA:\"$curif-in_bits_pass#{$colortrafficdown[0]}:$curif-in-pass:STACK\" "; diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index ef82716..cc38e65 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -91,7 +91,7 @@ if($_GET['act']=="new"){ $pconfig['tlsauth_enable'] = "yes"; $pconfig['autotls_enable'] = "yes"; $pconfig['dh_length'] = 1024; - $pconfig['device_mode'] = "tun"; + $pconfig['dev_mode'] = "tun"; $pconfig['interface'] = "wan"; $pconfig['local_port'] = openvpn_port_next('UDP'); $pconfig['pool_enable'] = "yes"; @@ -105,7 +105,7 @@ if($_GET['act']=="edit"){ $pconfig['mode'] = $a_server[$id]['mode']; $pconfig['protocol'] = $a_server[$id]['protocol']; $pconfig['authmode'] = $a_server[$id]['authmode']; - $pconfig['device_mode'] = $a_server[$id]['device_mode']; + $pconfig['dev_mode'] = $a_server[$id]['dev_mode']; $pconfig['interface'] = $a_server[$id]['interface']; if (!empty($a_server[$id]['ipaddr'])) { $pconfig['interface'] = $pconfig['interface'] . '|' . $a_server[$id]['ipaddr']; @@ -306,7 +306,7 @@ if ($_POST) { if (!empty($pconfig['authmode'])) $server['authmode'] = implode(",", $pconfig['authmode']); $server['protocol'] = $pconfig['protocol']; - $server['device_mode'] = $pconfig['device_mode']; + $server['dev_mode'] = $pconfig['dev_mode']; list($server['interface'], $server['ipaddr']) = explode ("|",$pconfig['interface']); $server['local_port'] = $pconfig['local_port']; $server['description'] = $pconfig['description']; @@ -668,12 +668,12 @@ if ($savemsg) <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Device Mode"); ?></td> <td width="78%" class="vtable"> - <select name="device_mode" class="formselect"> + <select name="dev_mode" class="formselect"> <?php foreach ($openvpn_dev_mode as $device): $selected = ""; - if (! empty($pconfig['device_mode'])) { - if ($pconfig['device_mode'] == $device) + if (! empty($pconfig['dev_mode'])) { + if ($pconfig['dev_mode'] == $device) $selected = "selected"; } else { if ($device == "tun") |