diff options
| author | Bill Marquette <billm@pfsense.org> | 2008-04-07 00:50:14 +0000 |
|---|---|---|
| committer | Bill Marquette <billm@pfsense.org> | 2008-04-07 00:50:14 +0000 |
| commit | 43e7c36ca7e730d87d4c5be3e09b5c15f416b346 (patch) | |
| tree | ba571607f17c257859ad985e6a17f9966649cbed /usr | |
| parent | 18e5545ede82176cae12a15e13b0aaec69875c9f (diff) | |
| download | pfsense-43e7c36ca7e730d87d4c5be3e09b5c15f416b346.zip pfsense-43e7c36ca7e730d87d4c5be3e09b5c15f416b346.tar.gz | |
fix up reverse logic in return_clog() so it doesn't default to reverse
make the slbd status pages override the reverse logic in return_clog()
so these pages aren't now broken. This change actually fixes the ipsec
diag logs page being reverse (and not honoring the log reverse/forward
setting on the logs setting page)
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 7 | ||||
| -rwxr-xr-x | usr/local/www/status_slbd_pool.php | 3 | ||||
| -rwxr-xr-x | usr/local/www/status_slbd_vs.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 2208f02..7dfd164 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -660,10 +660,9 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert } } -function return_clog($logfile, $tail, $grepfor = "", $grepinvert = "", $grepreverse = false) { +function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "", $grepreverse = false) { global $g, $config; - $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - $sor = isset($grepreverse) ? "-r" : ""; + $sor = (isset($config['syslog']['reverse']) || $grepreverse) ? "-r" : ""; $logarr = ""; $grepline = " "; if(is_array($grepfor)) @@ -829,4 +828,4 @@ function display_widget_tabs(& $tab_array) { echo "</div>"; } -?>
\ No newline at end of file +?> diff --git a/usr/local/www/status_slbd_pool.php b/usr/local/www/status_slbd_pool.php index da93f48..ca8ebe8 100755 --- a/usr/local/www/status_slbd_pool.php +++ b/usr/local/www/status_slbd_pool.php @@ -106,7 +106,8 @@ include("head.inc"); $lastchange = ""; $svr = split("\|", $server); $monitorip = $svr[1]; - $logstates = return_clog($slbd_logfile, $nentries, array("$monitorip", "marking"), true); + $logstates = return_clog($slbd_logfile, $nentries, true, array("$monitorip", "marking"), "", true); + $logstates = $logstates[0]; if(stristr($logstates, $monitorip)) { diff --git a/usr/local/www/status_slbd_vs.php b/usr/local/www/status_slbd_vs.php index 1bc3aa3..3d86ceb 100755 --- a/usr/local/www/status_slbd_vs.php +++ b/usr/local/www/status_slbd_vs.php @@ -110,7 +110,7 @@ include("head.inc"); foreach ((array) $vipent['servers'] as $server) { $lastchange = ""; $monitorip = $server; - $logstates = return_clog($slbd_logfile, $nentries, array("$monitorip", "marking"), true); + $logstates = return_clog($slbd_logfile, $nentries, true, array("$monitorip", "marking"), "", true); $logstates = $logstates[0]; if(stristr($logstates, $monitorip)) { |
