From 5a1a2539145d42ec2cbe15ab6530148d021d18c8 Mon Sep 17 00:00:00 2001
From: PiBa-NL <pba_2k3@yahoo.com>
Date: Tue, 10 Feb 2015 00:15:40 +0100
Subject: haproxy-devel, fix carp check settings for pfSense 2.2

Conflicts:
	config/haproxy-devel/haproxy_global.php
---
 config/haproxy-devel/haproxy_global.php | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'config/haproxy-devel/haproxy_global.php')

diff --git a/config/haproxy-devel/haproxy_global.php b/config/haproxy-devel/haproxy_global.php
index 60c2fd9d..978d778d 100755
--- a/config/haproxy-devel/haproxy_global.php
+++ b/config/haproxy-devel/haproxy_global.php
@@ -271,26 +271,12 @@ function enable_change(enable_change) {
 					Carp monitor
 				</td>
 				<td class="vtable">
-					<select name="carpdev" class="formfld">
-					<option value="disabled" <?php if (!isset($pconfig['carpdev'])) echo "selected"; ?>>
-						disabled
-					</option>
-				<?php
-					if(is_array($config['virtualip']['vip'])) {
-					foreach($config['virtualip']['vip'] as $carp):
-						if ($carp['mode'] != "carp") continue;
-						$ipaddress = $carp['subnet'];
-						$carp_int = trim(find_carp_interface($ipaddress));
-				?>
-					<option value="<?=$carp_int;?>"
-					 <?php if (isset($pconfig['carpdev']) && $carp_int == $pconfig['carpdev']) echo "selected"; ?>>
-						<?=$carp_int;?> (<?=$ipaddress;?>)
-					</option>
-				<?php
-					endforeach;
-					}
-				?>
-					</select>
+					<?php
+					$vipinterfaces = array();
+					$vipinterfaces[] = array('ip' => '', 'name' => 'Disabled');
+					$vipinterfaces += haproxy_get_bindable_interfaces($ipv="ipv4,ipv6", $interfacetype="carp");
+					echo_html_select('carpdev',$vipinterfaces, $pconfig['carpdev'],"No carp interfaces pressent");
+					?>				
 					<br/>
 					Monitor carp interface and only run haproxy on the firewall which is MASTER.
 				</td>
-- 
cgit v1.2.3