diff options
| author | jim-p <jimp@pfsense.org> | 2014-09-15 12:10:22 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-09-15 12:10:22 -0400 |
| commit | f0ea892e2457bb6a037690cc5a7b28a02f2b5728 (patch) | |
| tree | cd8d2670c0185004f11594eb9bfb5f8db5d36222 /config/haproxy-devel/haproxy_listeners.php | |
| parent | 553d26b557803ce3e83e4a5b0980e3b8d8691717 (diff) | |
| parent | f052b1e4fcec837f819fe05dbd38a0ed87e39333 (diff) | |
| download | pfsense-packages-f0ea892e2457bb6a037690cc5a7b28a02f2b5728.tar.gz pfsense-packages-f0ea892e2457bb6a037690cc5a7b28a02f2b5728.tar.bz2 pfsense-packages-f0ea892e2457bb6a037690cc5a7b28a02f2b5728.zip | |
Merge pull request #699 from PiBa-NL/haproxy_1.5.3
Diffstat (limited to 'config/haproxy-devel/haproxy_listeners.php')
| -rw-r--r-- | config/haproxy-devel/haproxy_listeners.php | 24 |
1 files changed, 14 insertions, 10 deletions
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 .= " " . 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 .= " " . 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;?>';"> |