Changeset 7567 for extensions/GMaps


Ignore:
Timestamp:
11/02/10 08:05:01 (9 years ago)
Author:
grum
Message:

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

Location:
extensions/GMaps
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/GMaps/admin/gmaps_kmlfiles_iListFiles.tpl

    r7133 r7567  
    11<table class="littlefont"> 
    22  {foreach from=$datas item=data} 
    3   <tr> 
     3  <tr title='[gmaps=kmlId:{$data.id};]'> 
    44    <td>{$data.name}</td> 
    55    <td style="width:300px;">{$data.file}</td> 
  • extensions/GMaps/admin/gmaps_maps_iListMaps.tpl

    r7177 r7567  
    11<table class="littlefont"> 
    22  {foreach from=$datas item=data} 
    3   <tr> 
     3  <tr title='[gmaps=id:{$data.id};]'> 
    44    <td>{$data.name}</td> 
    55    <td style="width:150px;">{$data.displayType}</td> 
  • extensions/GMaps/gmaps_pip.class.inc.php

    r7562 r7567  
    117117 
    118118    $mapParams=array(); 
    119     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) 
     119    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) 
    120120    { 
    121121 
     
    132132 
    133133      $desc = preg_replace( 
    134         '/\[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', 
     134        '/\[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', 
    135135        "<div class='gmapsMarkup' id='gmapsMarkupId$1'></div>", $desc); 
    136136 
     
    157157            while($row=pwg_db_fetch_assoc($result)) 
    158158            { 
    159               $mapParam['kmlUrl']=dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.$row[0]; 
     159              $mapParam['kmlUrl']=dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.$row['file']; 
    160160            } 
    161161          } 
  • extensions/GMaps/main.inc.php

    r7562 r7567  
    6868|         |            |   . Incompatibility with ExtendedDescription 
    6969|         |            | 
    70 |         |            | 
    71 |         |            | 
     70|         |            | * mantis bug:1991 
     71|         |            |   . [gmaps] markup, kmlId is not functionnal 
    7272|         |            | 
    7373|         |            | 
Note: See TracChangeset for help on using the changeset viewer.