diff options
| author | serg dvoriancev <dv_serg@mail.ru> | 2010-04-12 21:52:00 +0400 |
|---|---|---|
| committer | serg dvoriancev <dv_serg@mail.ru> | 2010-04-12 21:52:00 +0400 |
| commit | 312f6a4827d742869daba0ebb186b6de5483379a (patch) | |
| tree | 9285758224d8a53d519f7fab142629397e1ef13d /config/haproxy-dev/haproxy_pools.php | |
| parent | 8d8c3e1278c35aaf235710d07cbe6583337700d5 (diff) | |
| parent | e8fa9505ad3c402bf4a5b5143842c0028382a658 (diff) | |
| download | pfsense-packages-312f6a4827d742869daba0ebb186b6de5483379a.tar.gz pfsense-packages-312f6a4827d742869daba0ebb186b6de5483379a.tar.bz2 pfsense-packages-312f6a4827d742869daba0ebb186b6de5483379a.zip | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense-packages/mainline
Diffstat (limited to 'config/haproxy-dev/haproxy_pools.php')
| -rwxr-xr-x | config/haproxy-dev/haproxy_pools.php | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/config/haproxy-dev/haproxy_pools.php b/config/haproxy-dev/haproxy_pools.php index 78a1fdff..c5adc70b 100755 --- a/config/haproxy-dev/haproxy_pools.php +++ b/config/haproxy-dev/haproxy_pools.php @@ -103,38 +103,41 @@ include("head.inc"); <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="30%" class="listhdrr">Name</td> - <td width="20%" class="listhdrr">Status</td> - <td width="30%" class="listhdrr">Listener</td> + <td width="10%" class="listhdrr">Servers</td> + <td width="40%" class="listhdrr">Listener</td> <td width="10%" class="list"></td> </tr> <?php $i = 0; foreach ($a_pools as $pool): + + $fe_list = ""; + $sep = ""; + foreach ($a_backends as $backend) { + if($backend['pool'] == $pool['name']) { + $fe_list .= $sep . $backend['name']; + $sep = ", "; + } + } $textss = $textse = ""; - if ($pool['status'] != 'active') { + if ($fe_list == "") { $textss = "<span class=\"gray\">"; $textse = "</span>"; } + if (is_array($pool['ha_servers']['item'])) + $count = count($pool['ha_servers']['item']); + else + $count = 0; ?> <tr> <td class="listlr" ondblclick="document.location='haproxy_pool_edit.php?id=<?=$i;?>';"> <?=$textss . $pool['name'] . $textse;?> </td> <td class="listlr" ondblclick="document.location='haproxy_pool_edit.php?id=<?=$i;?>';"> - <?=$textss . $pool['status'] . $textse;?> + <?=$textss . $count . $textse;?> </td> <td class="listlr" ondblclick="document.location='haproxy_pool_edit.php?id=<?=$i;?>';"> -<?php - echo $textss; - $sep = ""; - foreach ($a_backends as $backend) { - if($backend['pool'] == $pool['name']) { - echo $sep . $backend['name']; - $sep = ", "; - } - } - echo $textse; -?> + <?=$textss . $fe_list . $textse;?> </td> <td class="list" nowrap> <table border="0" cellspacing="0" cellpadding="1"> |