Changeset 7567 for extensions/GMaps

Timestamp:

Nov 2, 2010, 8:05:01 AM (14 years ago)

Author:

grum

Message:

fix bug:1991 - [gmaps] markup, kmlId is not functionnal

Location:

extensions/GMaps

Files:

• admin/gmaps_kmlfiles_iListFiles.tpl (modified) (1 diff)
• admin/gmaps_maps_iListMaps.tpl (modified) (1 diff)
• gmaps_pip.class.inc.php (modified) (3 diffs)
• main.inc.php (modified) (1 diff)

extensions/GMaps/admin/gmaps_kmlfiles_iListFiles.tpl

@@ -1 +1 @@
 <table class="littlefont">
   {foreach from=$datas item=data}
-  <tr>
+  <tr title='[gmaps=kmlId:{$data.id};]'>
     <td>{$data.name}</td>
     <td style="width:300px;">{$data.file}</td>

extensions/GMaps/admin/gmaps_maps_iListMaps.tpl

@@ -1 +1 @@
 <table class="littlefont">
   {foreach from=$datas item=data}
-  <tr>
+  <tr title='[gmaps=id:{$data.id};]'>
     <td>{$data.name}</td>
     <td style="width:150px;">{$data.displayType}</td>

extensions/GMaps/gmaps_pip.class.inc.php

@@ -117 +117 @@
 
     $mapParams=array();
-    if(preg_match_all('/\[gmaps=(?:id:(?<id>\d+);|width:(?<width>\d+);|height:(?<height>\d+);|markerImg:(?<markerImg>.+);|kmlId:(?<kmlId>\d+);|kmlUrl:"(?<kmlUrl>.+)";|allowBubble:(?<allowBubble>y|n);|kmlZoom:(?<kmlZoom>y|n);|markerVisible:(?<markerVisible>y|n);)+\]/i',$desc,$mapParams,PREG_SET_ORDER)>0)
+    if(preg_match_all('/\[gmaps=(?:id:(?<id>\d+);|width:(?<width>\d+);|height:(?<height>\d+);|markerImg:(?<markerImg>[a-z0-9\-\._]+);|kmlId:(?<kmlId>\d+);|kmlUrl:"(?<kmlUrl>.+)";|allowBubble:(?<allowBubble>y|n);|kmlZoom:(?<kmlZoom>y|n);|markerVisible:(?<markerVisible>y|n);)+\]/i',$desc,$mapParams,PREG_SET_ORDER)>0)
     {
 
@@ -132 +132 @@
 
       $desc = preg_replace(
-        '/\[gmaps=(?:id:(?<id>\d+);|width:(?<width>\d+);|height:(?<height>\d+);|markerImg:(?<markerImg>.+);|kmlId:(?<kmlId>\d+);|kmlUrl:"(?<kmlUrl>.+)";|allowBubble:(?<allowBubble>y|n);|kmlZoom:(?<kmlZoom>y|n);|markerVisible:(?<markerVisible>y|n);)+\]/i',
+        '/\[gmaps=(?:id:(?<id>\d+);|width:(?<width>\d+);|height:(?<height>\d+);|markerImg:(?<markerImg>[a-z0-9\-\._]+);|kmlId:(?<kmlId>\d+);|kmlUrl:"(?<kmlUrl>.+)";|allowBubble:(?<allowBubble>y|n);|kmlZoom:(?<kmlZoom>y|n);|markerVisible:(?<markerVisible>y|n);)+\]/i',
         "<div class='gmapsMarkup' id='gmapsMarkupId$1'></div>", $desc);
 
@@ -157 +157 @@
             while($row=pwg_db_fetch_assoc($result))
             {
-              $mapParam['kmlUrl']=dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.$row[0];
+              $mapParam['kmlUrl']=dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.$row['file'];
             }
           }

extensions/GMaps/main.inc.php

@@ -68 +68 @@
 |         |            |   . Incompatibility with ExtendedDescription
 |         |            |
-|         |            |
-|         |            |
+|         |            | * mantis bug:1991
+|         |            |   . [gmaps] markup, kmlId is not functionnal
 |         |            |
 |         |            |