[Nagvis-checkins] SF.net Git: nagvis: Bugfix: Also using source_file parameter for cache file names to prevent problems with multiple geomaps

[lars <la...@us...>]

Author:   Lars Michelsen <lm...@la...>
Date:     Wed Nov 28 17:18:56 2012 +0100
Committer:   Lars Michelsen <lm...@la...>
Commit-Date: Wed Nov 28 17:18:56 2012 +0100

Bugfix: Also using source_file parameter for cache file names to prevent problems with multiple geomaps

---

 ChangeLog                            |    2 ++
 share/server/core/sources/geomap.php |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5833d63..3ea3fbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ Geomap:
     to be shown need the custom variables _LAT and _LONG. The hosts can
     optionally be filtered by hostgroups
   * Bugfix: Always rounding calculated coordinates, fixed negative coords
+  * Bugfix: Also using source_file parameter for cache file names to prevent
+    problems with multiple geomaps
 
 1.7.3
 Core:
diff --git a/share/server/core/sources/geomap.php b/share/server/core/sources/geomap.php
index 3793abc..ab8814f 100644
--- a/share/server/core/sources/geomap.php
+++ b/share/server/core/sources/geomap.php
@@ -189,10 +189,10 @@ $configVars = array(
 );
 
 function geomap_files($params) {
-    $use_params = $params;
-    if(isset($use_params['source_file']))
-        unset($use_params['source_file']);
-    $image_name  = 'geomap-'.implode('_', array_values($use_params)).'.png';
+    // The source_file parameter was filtered here in previous versions. Users
+    // reported that this is not very useful. So I removed it. Hope it works
+    // for most users.
+    $image_name  = 'geomap-'.implode('_', array_values($params)).'.png';
     return array(
         $image_name,
         path('sys', '', 'backgrounds').'/'.$image_name,