From 9e2aed3a673ec1df02f072c3051ae7337f96527b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 28 Dec 2009 16:42:24 -0500
Subject: Retries is not a required field

---
 config/haproxy/haproxy_frontends_edit.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'config')

diff --git a/config/haproxy/haproxy_frontends_edit.php b/config/haproxy/haproxy_frontends_edit.php
index 4b23fb37..1986b176 100755
--- a/config/haproxy/haproxy_frontends_edit.php
+++ b/config/haproxy/haproxy_frontends_edit.php
@@ -84,11 +84,11 @@ if ($_POST) {
 	$pconfig = $_POST;
 	
 	if ($_POST['stats_enabled']) {
-		$reqdfields = explode(" ", "name connection_timeout server_timeout retries stats_username stats_password stats_uri stats_realm");
-		$reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout,Retries,Stats Username,Stats Password,Stats Uri,Stats Realm");		
+		$reqdfields = explode(" ", "name connection_timeout server_timeout stats_username stats_password stats_uri stats_realm");
+		$reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout,Stats Username,Stats Password,Stats Uri,Stats Realm");		
 	} else {
-		$reqdfields = explode(" ", "name connection_timeout server_timeout retries monitor_uri");
-		$reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout,Retries,Monitor Uri");		
+		$reqdfields = explode(" ", "name connection_timeout server_timeout monitor_uri");
+		$reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout,Monitor Uri");		
 	}
 	
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
@@ -107,7 +107,7 @@ if ($_POST) {
 	if (!is_numeric($_POST['server_timeout']))
 		$input_errors[] = "The field 'Server timeout' value is not a number.";
 
-	if (!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']))
@@ -402,7 +402,7 @@ include("head.inc");
 			</td>
 		</tr>
 		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">Retries</td>
+			<td width="22%" valign="top" class="vncell">Retries</td>
 			<td width="78%" class="vtable" colspan="2">
 				<input name="retries" type="text" <?if(isset($pconfig['retries'])) echo "value=\"{$pconfig['retries']}\"";?> size="64">
 				<div>After a connection failure to a server, it is possible to retry, potentially
-- 
cgit v1.2.3