diff options
Diffstat (limited to 'usr/local/www')
| -rw-r--r-- | usr/local/www/interfaces_ppps_edit.php | 7 | ||||
| -rw-r--r-- | usr/local/www/load_balancer_virtual_server_edit.php | 8 | ||||
| -rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php index 15c4a0b..c5c6c63 100644 --- a/usr/local/www/interfaces_ppps_edit.php +++ b/usr/local/www/interfaces_ppps_edit.php @@ -488,7 +488,12 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE" mwexec("/bin/mkdir -p /var/spool/lock"); } // $serialports = pfSense_get_modem_devices(); - $serialports = glob("/dev/cua?[0-9]{,.[0-9]}", GLOB_BRACE); + // Match files in /dev starting with "cua" then: + // ? = any single character e.g. like "cuau" + // [0-9] = a digit from 0 to 9 + // {,[0-9]} = nothing (the empty before the comma) or a digit from 0 to 9 + // This supports up to 100 devices (0 to 99), e.g. cuau0 cuau1 ... cuau10 cuau11 ... cuau99 + $serialports = glob("/dev/cua?[0-9]{,[0-9]}", GLOB_BRACE); $serport_count = 0; foreach ($serialports as $port) { $serport_count++; diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php index aa1fd1c..39bc6c9 100644 --- a/usr/local/www/load_balancer_virtual_server_edit.php +++ b/usr/local/www/load_balancer_virtual_server_edit.php @@ -65,7 +65,7 @@ if (isset($id) && $a_vs[$id]) { $pconfig = $a_vs[$id]; } else { // Sane defaults - $pconfig['mode'] = 'redirect'; + $pconfig['mode'] = 'redirect_mode'; } $changedesc = gettext("Load Balancer: Virtual Server:") . " "; @@ -77,14 +77,14 @@ if ($_POST) { /* input validation */ switch ($pconfig['mode']) { - case "redirect": { + case "redirect_mode": { $reqdfields = explode(" ", "ipaddr name mode"); $reqdfieldsn = array(gettext("IP Address"), gettext("Name"), gettext("Mode")); break; } - case "relay": { + case "relay_mode": { $reqdfields = explode(" ", "ipaddr name mode relay_protocol"); - $reqdfieldsn = array(gettext("IP Address"), gettext("Name"), gettext("Relay Protocol")); + $reqdfieldsn = array(gettext("IP Address"), gettext("Name"), gettext("Mode"), gettext("Relay Protocol")); break; } } diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc index 5bb3ca5..3f68869 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -607,6 +607,12 @@ function step3_stepsubmitphpaction() { $config['ezshaper']['step3']['address'] = $_POST['upstream_sip_server']; if ($_POST['enable'] == 'on') $config['ezshaper']['step3']['enable'] = 'on'; + if (!empty($_POST['provider'])) { + $VoIPproviders = array("Generic", "VoicePulse", "Asterisk", "Panasonic"); + if (in_array($_POST['provider'], $VoIPproviders)) { + $config['ezshaper']['step3']['provider'] = $_POST['provider']; + } + } for ($i = 0; $i < $localint; $i++) { $config['ezshaper']['step3']["local{$i}download"] = $_POST["local{$i}download"]; $config['ezshaper']['step3']["local{$i}downloadspeed"] = $_POST["local{$i}downloadspeed"]; |
