tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-25 18:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

When "EnableContextLinks" was disabled, the "IPAddressResolve" setting was ignored.

Browse Source 
The check order in AddContextLinks has been fixed now in order to solve the problem.
This commit is contained in:
Andre Lorbach 2011-09-13 11:39:08 +02:00
parent 92da351766
commit cedddbf053
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/functions_common.php
View File

@ -1350,10 +1350,6 @@ function AddContextLinks(&$sourceTxt)
{ {
global $szTLDDomains; global $szTLDDomains;
// check if user disabled Context Links.
if ( GetConfigSetting("EnableContextLinks", 1, CFGLEVEL_USER) == 0 )
return;
// Return if not enabled! // Return if not enabled!
if ( GetConfigSetting("EnableIPAddressResolve", 0, CFGLEVEL_USER) == 1 ) if ( GetConfigSetting("EnableIPAddressResolve", 0, CFGLEVEL_USER) == 1 )
{ {
@ -1361,6 +1357,10 @@ function AddContextLinks(&$sourceTxt)
$sourceTxt = preg_replace( '/([^\[])\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/ie', "'\\1\\2.\\3.\\4.\\5' . ReverseResolveIP('\\2.\\3.\\4.\\5', '<font class=\"highlighted\"> {', '} </font>')", $sourceTxt ); $sourceTxt = preg_replace( '/([^\[])\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/ie', "'\\1\\2.\\3.\\4.\\5' . ReverseResolveIP('\\2.\\3.\\4.\\5', '<font class=\"highlighted\"> {', '} </font>')", $sourceTxt );
} }
// check if user disabled Context Links.
if ( GetConfigSetting("EnableContextLinks", 1, CFGLEVEL_USER) == 0 )
return;
// Create if not set! // Create if not set!
if ( !isset($szTLDDomains) ) if ( !isset($szTLDDomains) )
CreateTopLevelDomainSearch(); CreateTopLevelDomainSearch();