diff options
| author | Ermal Luçi <eri@pfsense.org> | 2013-03-05 15:24:47 -0800 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2013-03-05 15:24:47 -0800 |
| commit | 07fcf185d0529bc66b1f66afb3b0184d1b2e7916 (patch) | |
| tree | 4bd43d2d80f9abd7d5741a006717cf765c27627f /config/haproxy-devel/haproxy_pool_edit.php | |
| parent | 9034c74fb85eb222a512243dbaf56c8a6646061d (diff) | |
| parent | 00240df580c59b9a54dafafcbf5524d266f1616e (diff) | |
| download | pfsense-packages-07fcf185d0529bc66b1f66afb3b0184d1b2e7916.tar.gz pfsense-packages-07fcf185d0529bc66b1f66afb3b0184d1b2e7916.tar.bz2 pfsense-packages-07fcf185d0529bc66b1f66afb3b0184d1b2e7916.zip | |
Merge pull request #401 from PiBa-NL/haproxy-devel-2.1
Haproxy-devel, require pfSense 2.1, shared ssloffloading, error checking
Diffstat (limited to 'config/haproxy-devel/haproxy_pool_edit.php')
| -rw-r--r-- | config/haproxy-devel/haproxy_pool_edit.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config/haproxy-devel/haproxy_pool_edit.php b/config/haproxy-devel/haproxy_pool_edit.php index fa46efb2..09474f02 100644 --- a/config/haproxy-devel/haproxy_pool_edit.php +++ b/config/haproxy-devel/haproxy_pool_edit.php @@ -88,13 +88,13 @@ if ($_POST) { if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['name'])) $input_errors[] = "The field 'Name' contains invalid characters."; - if (!is_numeric($_POST['connection_timeout'])) + if ($_POST['connection_timeout'] !== "" && !is_numeric($_POST['connection_timeout'])) $input_errors[] = "The field 'Connection timeout' value is not a number."; - if (!is_numeric($_POST['server_timeout'])) + if ($_POST['server_timeout'] !== "" && !is_numeric($_POST['server_timeout'])) $input_errors[] = "The field 'Server timeout' value is not a number."; - if (!$_POST['retries'] && is_numeric($_POST['retries'])) + if ($_POST['retries'] !== "" && !is_numeric($_POST['retries'])) $input_errors[] = "The field 'Retries' value is not a number."; if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['stats_username'])) @@ -215,7 +215,7 @@ row_helper(); <input type='hidden' name='address_type' value='textbox' /> -<body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="updatevisibility()"> +<body link="#0000CC" vlink="#0000CC" alink="#0000CC""> <style type="text/css"> .haproxy_stats_visible{display:none;} </style> @@ -476,14 +476,14 @@ row_helper(); <td width="22%" valign="top" class="vncellreq">Connection timeout</td> <td width="78%" class="vtable" colspan="2"> <input name="connection_timeout" type="text" <?if(isset($pconfig['connection_timeout'])) echo "value=\"{$pconfig['connection_timeout']}\"";?> size="64"> - <div>the time (in milliseconds) we give up if the connection does not complete within (30000).</div> + <div>the time (in milliseconds) we give up if the connection does not complete within (default 30000).</div> </td> </tr> <tr align="left"> <td width="22%" valign="top" class="vncellreq">Server timeout</td> <td width="78%" class="vtable" colspan="2"> <input name="server_timeout" type="text" <?if(isset($pconfig['server_timeout'])) echo "value=\"{$pconfig['server_timeout']}\"";?> size="64"> - <div>the time (in milliseconds) we accept to wait for data from the server, or for the server to accept data (30000).</div> + <div>the time (in milliseconds) we accept to wait for data from the server, or for the server to accept data (default 30000).</div> </td> </tr> <tr align="left"> @@ -586,6 +586,7 @@ set by the 'retries' parameter.</div> rows = 1; totalrows = <?php echo $counter; ?>; loaded = <?php echo $counter; ?>; + updatevisibility(); </script> </body> </html> |