From 7b6ce87468914d5e18d316a6f0fe49af516fa64c Mon Sep 17 00:00:00 2001
From: Paul Venezia <pvenezia@pvenezia.com>
Date: Wed, 17 Jul 2013 18:36:58 -0400
Subject: Fixed cosmetic table display bug in haproxy_listeners.php, and DOS
 newline bug in advanced passthru config writes in haproxy.inc

---
 config/haproxy-devel/haproxy.inc           | 7 ++++---
 config/haproxy-devel/haproxy_listeners.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index 3afefb49..f871ddd7 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -459,7 +459,7 @@ function write_backend($fd, $name, $pool, $frontend) {
 		$adv_be	= explode("\n", base64_decode($pool['advanced_backend']));
 		foreach($adv_be as $adv_line) {
 			if ($adv_line != "") {
-				fwrite($fd, "\t" . $adv_line . "\n");
+				fwrite($fd, "\t" . str_replace("\r", "", $adv_line) . "\n");
 			}
 		}
 	}
@@ -573,7 +573,8 @@ function haproxy_writeconf($configfile) {
 		if($a_global['advanced']) {
 			$adv = explode("\n", base64_decode($a_global['advanced']));
 			foreach($adv as $adv_line) {
-				fwrite($fd, "\t" . $adv_line . "\n");
+				fwrite($fd, "\t" . str_replace("\r", "", $adv_line) . "\n");
+
 			}
 		}
 		fwrite ($fd, "\n");
@@ -687,7 +688,7 @@ function haproxy_writeconf($configfile) {
 				$advanced	= explode("\n", base64_decode($bind['advanced']));
 				foreach($advanced as $adv_line) {
 					if ($adv_line != "") {
-						fwrite($fd, "\t" . $adv_line . "\n");
+						fwrite($fd, "\t" . str_replace("\r", "", $adv_line) . "\n");
 					}
 				}
 			}
diff --git a/config/haproxy-devel/haproxy_listeners.php b/config/haproxy-devel/haproxy_listeners.php
index d634ded4..2a58ac9a 100644
--- a/config/haproxy-devel/haproxy_listeners.php
+++ b/config/haproxy-devel/haproxy_listeners.php
@@ -136,7 +136,7 @@ include("head.inc");
 		foreach ($a_backend as $backend):
 			$backendname = $backend['name'];
 			$textgray = $backend['status'] != 'active' ? " gray" : "";
-			if (isset($ipport_previous ) && $backend['ipport'] != $ipport_previous):
+			if (isset($ipport_previous ) && $backend['ipport'] == $ipport_previous):
 			?>
 				<tr class="<?=$textgray?>"><td collspan="7">&nbsp;</td></tr>
 			<?
-- 
cgit v1.2.3