diff options
| author | sullrich <sullrich@pfsense.org> | 2009-12-15 09:12:56 -0500 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-12-15 09:12:56 -0500 |
| commit | dcef4b5ba15e3c157f4c3b0b6b6ca33ab78a554a (patch) | |
| tree | b94fdf8b5c0d5e0c2803c73b9ac5215f3f94fefa | |
| parent | 64d7fb839093018867e7f2fae3690a0946686dcf (diff) | |
| download | pfsense-packages-dcef4b5ba15e3c157f4c3b0b6b6ca33ab78a554a.tar.gz pfsense-packages-dcef4b5ba15e3c157f4c3b0b6b6ca33ab78a554a.tar.bz2 pfsense-packages-dcef4b5ba15e3c157f4c3b0b6b6ca33ab78a554a.zip | |
pick up frontend ports correctly
| -rw-r--r-- | config/haproxy/haproxy.inc | 4 | ||||
| -rwxr-xr-x | config/haproxy/haproxy_servers_edit.php | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc index c9ce9695..59350259 100644 --- a/config/haproxy/haproxy.inc +++ b/config/haproxy/haproxy.inc @@ -218,9 +218,9 @@ function haproxy_configure() { else $cookie = ""; if(!$server['port']) { + $server_ports = ""; + $isfirst = true; foreach($ports as $port) { - $isfirst = false; - $server_ports = ""; if($port) { if(!$isfirst) $server_ports .= ","; diff --git a/config/haproxy/haproxy_servers_edit.php b/config/haproxy/haproxy_servers_edit.php index 9ea8e64b..8af4fc90 100755 --- a/config/haproxy/haproxy_servers_edit.php +++ b/config/haproxy/haproxy_servers_edit.php @@ -78,11 +78,12 @@ if ($_POST) { if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['cookie'])) $input_errors[] = "The field 'Cookie' contains invalid characters."; - if (!is_numeric($_POST['port'])) + if ($_POST['port'] && !is_numeric($_POST['port'])) $input_errors[] = "The field 'Port' value is not a number."; else { - if (!($_POST['port']>=1 && $_POST['port']<=65535)) - $input_errors[] = "The field 'Port' value must be between 1 and 65535."; + if ($_POST['port']) + if (!($_POST['port']>=1 && $_POST['port']<=65535)) + $input_errors[] = "The field 'Port' value must be between 1 and 65535."; } if (!is_numeric($_POST['weight'])) |