Module: nagvis Branch: master Commit: eb3dd6d04a247e60baa4c143913015511adee702 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=eb3dd6d04a247e60baa4c143913015511adee702
Author: Lars Michelsen <[email protected]> Date: Fri Sep 3 12:19:23 2010 +0200 Improved automap selection to find hostnames when the host parameter ist not the first one --- share/server/core/classes/NagVisAutoMap.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/share/server/core/classes/NagVisAutoMap.php b/share/server/core/classes/NagVisAutoMap.php index b657c2f..67ff0e6 100644 --- a/share/server/core/classes/NagVisAutoMap.php +++ b/share/server/core/classes/NagVisAutoMap.php @@ -395,7 +395,7 @@ class NagVisAutoMap extends GlobalMap { $sLine = str_replace('-', '-', $sLine); // Extract the area objects // Only parsing rect/polys at the moment - if(preg_match('/^<area\sshape="(rect|poly)"\s(id="[^"]+"\s)?href=".+\?host=([^"]+)"\starget="[a-zA-Z-_]*"\stitle="[^"]+"\salt=""\scoords="([^"]+)"\/>$/i', $sLine, $aMatches)) { + if(preg_match('/^<area\sshape="(rect|poly)"\s(id="[^"]+"\s)?href=".+[?&]host=([^"]+)"\starget="[a-zA-Z-_]*"\stitle="[^"]+"\salt=""\scoords="([^"]+)"\/>$/i', $sLine, $aMatches)) { if(isset($aMatches[1]) && isset($aMatches[2]) && isset($aMatches[3]) && isset($aMatches[4])) { $type = $aMatches[1]; $name1 = str_replace('-', '-', trim($aMatches[3])); ------------------------------------------------------------------------------ This SF.net Dev2Dev email is sponsored by: Show off your parallel programming skills. Enter the Intel(R) Threading Challenge 2010. http://p.sf.net/sfu/intel-thread-sfd _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
