diff options
author | Ermal <eri@pfsense.org> | 2010-11-23 12:47:27 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2010-11-23 12:47:27 +0000 |
commit | 108cfddf3e133aecbe113fdf8eecfdc7fd2aab07 (patch) | |
tree | 09d2dc08769f03887502fc35534c8160b0e71cb3 /usr/local/www | |
parent | 83ae810386210eca593244035825296170281db4 (diff) | |
download | pfsense-108cfddf3e133aecbe113fdf8eecfdc7fd2aab07.zip pfsense-108cfddf3e133aecbe113fdf8eecfdc7fd2aab07.tar.gz |
Ticket #1023. Correct the widget code bringing it full speed with latest carp code.
Diffstat (limited to 'usr/local/www')
-rw-r--r-- | usr/local/www/widgets/include/carp_status.inc | 2 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/carp_status.widget.php | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/usr/local/www/widgets/include/carp_status.inc b/usr/local/www/widgets/include/carp_status.inc index d2851d2..79d3c03 100644 --- a/usr/local/www/widgets/include/carp_status.inc +++ b/usr/local/www/widgets/include/carp_status.inc @@ -4,4 +4,4 @@ $carp_status_title = "Carp Status"; $carp_status_title_link = "carp_status.php"; -?>
\ No newline at end of file +?> diff --git a/usr/local/www/widgets/widgets/carp_status.widget.php b/usr/local/www/widgets/widgets/carp_status.widget.php index 7c98946..6399579 100644 --- a/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/usr/local/www/widgets/widgets/carp_status.widget.php @@ -37,13 +37,14 @@ require_once("/usr/local/www/widgets/include/carp_status.inc"); if(is_array($config['virtualip']['vip'])) { $carpint=0; foreach($config['virtualip']['vip'] as $carp) { - if ($carp['mode'] != "carp") continue; + if ($carp['mode'] != "carp") + continue; $ipaddress = $carp['subnet']; $password = $carp['password']; - $netmask = $carp['subnet_bits']; + $netmask = $carp['subnet_bits']; $vhid = $carp['vhid']; $advskew = $carp['advskew']; - $carp_int = find_carp_interface($ipaddress); + $carp_int = "vip{$vhid}"; $status = get_carp_interface_status($carp_int); ?> <tr> @@ -54,7 +55,7 @@ require_once("/usr/local/www/widgets/include/carp_status.inc"); </td> <td width="70%" class="listr"> <?php - if($status == "MASTER") { + if($status == "MASTER") { echo "<img src='/themes/".$g['theme']."/images/icons/icon_pass.gif' title=\"$status\">"; } else if($status == "BACKUP") { echo "<img src='/themes/".$g['theme']."/images/icons/icon_pass_d.gif' title=\"$status\">"; @@ -73,4 +74,4 @@ require_once("/usr/local/www/widgets/include/carp_status.inc"); <?php } ?> -</table>
\ No newline at end of file +</table> |