From f052b1e4fcec837f819fe05dbd38a0ed87e39333 Mon Sep 17 00:00:00 2001
From: PiBa-NL <pba_2k3@yahoo.com>
Date: Sun, 14 Sep 2014 16:47:39 +0200
Subject: haproxy-devel improvements -server certificate check options
 -client-certificate support -logging options -unix sockets for faster
 backend>frontend communication

---
 config/haproxy-devel/haproxy_listeners.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

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

diff --git a/config/haproxy-devel/haproxy_listeners.php b/config/haproxy-devel/haproxy_listeners.php
index 7022ec34..10a355df 100644
--- a/config/haproxy-devel/haproxy_listeners.php
+++ b/config/haproxy-devel/haproxy_listeners.php
@@ -151,6 +151,14 @@ include("head.inc");
 				  </td>
 				  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$frontendname;?>';">
 					<? 
+					$acls = get_frontend_acls($frontend);
+					$isaclset = "";
+					foreach ($acls as $acl) {
+						$isaclset .= "&#10;" . htmlspecialchars($acl['descr']);
+					}
+					if ($isaclset) 
+						echo "<img src=\"$img_acl\" title=\"" . gettext("acl's used") . ": {$isaclset}\" border=\"0\" />";
+						
 					if (strtolower($frontend['type']) == "http" && $frontend['ssloffload']) {
 						$cert = lookup_cert($frontend['ssloffloadcert']);
 						$descr = htmlspecialchars($cert['descr']);
@@ -166,15 +174,6 @@ include("head.inc");
 						echo '<img src="'.$img_cert.'" title="SSL offloading cert: '.$descr.'" alt="SSL offloading" border="0" height="16" width="16" />';
 					}
 					
-					$acls = get_frontend_acls($frontend);
-					$isaclset = "";
-					foreach ($acls as $acl) {
-						$isaclset .= "&#10;" . htmlspecialchars($acl['descr']);
-					}
-					
-					if ($isaclset) 
-						echo "<img src=\"$img_acl\" title=\"" . gettext("acl's used") . ": {$isaclset}\" border=\"0\" />";
-						
 					$isadvset = "";
 					if ($frontend['advanced_bind']) $isadvset .= "Advanced bind: ".htmlspecialchars($frontend['advanced_bind'])."\r\n";
 					if ($frontend['advanced']) $isadvset .= "Advanced pass thru setting used\r\n";
@@ -188,7 +187,10 @@ include("head.inc");
 						$backend_serverpool_hint = gettext("Servers in pool:");
 						if (is_array($servers)){
 							foreach($servers as $server){
-								$backend_serverpool_hint .= "\n".$server['address'].":".$server['port'];
+								if ($server['forwardto'] && $server['forwardto'] != "")
+									$backend_serverpool_hint .= "\n[".$server['forwardto']."]";
+								else								
+									$backend_serverpool_hint .= "\n".$server['address'].":".$server['port'];
 							}
 						}
 					}
@@ -208,7 +210,9 @@ include("head.inc");
 				  </td>
 				  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$frontendname;?>';">
 					<div title='<?=$backend_serverpool_hint;?>'>
+					<a href="haproxy_pool_edit.php?id=<?=$frontend['backend_serverpool']?>">
 					<?=$frontend['backend_serverpool']?>
+					</a>
 					</div>
 				  </td>
 				  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$frontendname;?>';">
-- 
cgit v1.2.3