Changeset 7479 for extensions/GMaps/gmaps_ajax.php

Timestamp:

Oct 29, 2010, 3:01:40 PM (13 years ago)

Author:

grum

Message:

implement feature:1950

File:

• extensions/GMaps/gmaps_ajax.php (modified) (8 diffs)

extensions/GMaps/gmaps_ajax.php

@@ -228 +228 @@
               if(!($_REQUEST['datas']['applySubCat']=='y' or
                    $_REQUEST['datas']['applySubCat']=='n')) $_REQUEST['datas']['applySubCat']='y';
+
+              if(!isset($_REQUEST['datas']['forceDisplay'])) $_REQUEST['datas']['forceDisplay']='n';
+              if(!($_REQUEST['datas']['forceDisplay']=='y' or
+                   $_REQUEST['datas']['forceDisplay']=='n')) $_REQUEST['datas']['forceDisplay']='n';
             }
           }
@@ -565 +569 @@
                    pgmm.name AS mapName, pgmm.displayType,
                    pgcm.kmlFileId, pgcm.kmlFileUrl, pgcm.imgSort, pgcm.applySubCat, pgcm.icon,
-                   pgcm.title, pgkf.name AS kmlName
+                   pgcm.title, pgkf.name AS kmlName, pgcm.forceDisplay
             FROM ((".$this->tables['category_maps']." pgcm
                   LEFT JOIN ".CATEGORIES_TABLE." pct ON pct.id=pgcm.categoryId)
@@ -604 +608 @@
             'icon' => $row['icon'],
             'displayType' => l10n('gmaps_displayTypeShort'.$row['displayType']),
-            'title' => $row['title']
+            'title' => $row['title'],
+            'forceDisplay' => l10n('gmaps_'.$row['forceDisplay']),
           );
 
@@ -685 +690 @@
                 basename($properties['icon'])."', '".
                 basename($properties['marker'])."', '".
-                mysql_escape_string($properties['title'])."');";
+                mysql_escape_string($properties['title'])."', '".
+                $properties['forceDisplay']."');";
         $result=pwg_query($sql);
         $id=pwg_db_insert_id();
@@ -700 +706 @@
                 basename($properties['icon'])."', marker='".
                 basename($properties['marker'])."', title='".
-                mysql_escape_string($properties['title'])."'
+                mysql_escape_string($properties['title'])."', forceDisplay='".
+                $properties['forceDisplay']."'
               WHERE id='$id';";
         $result=pwg_query($sql);
@@ -728 +735 @@
         'icon' => '',
         'marker' => '',
-        'title' => ''
+        'title' => '',
+        'forceDisplay' => 'n'
       );
 
       $sql="SELECT id, categoryId, mapId, applySubCat, kmlFileId, kmlFileUrl,
-                   icon, marker, title
+                   icon, marker, title, forceDisplay
             FROM ".$this->tables['category_maps']."
             WHERE id='$id';";
@@ -1275 +1283 @@
             $coords['lng']+=$point['longitude'];
 
-            $coords['imgTn'][]=$point['imageTnFile'];
+            $coords['imgTn'][]=$this->replaceImgRoot($point['imageTnFile']);
             $coords['imgCatsNames'][]=$tmpCatsNames;
             $coords['imgName'][]=GPCCore::getUserLanguageDesc($point['imageName']);
@@ -1347 +1355 @@
     private function replaceImgRoot($value)
     {
+      return($value);
       if(preg_match('/^\.\/galleries\//i', $value)>0)
       {
         return("G".substr($value,12));
       }
-      elseif("U".preg_match('/^\.\/upload\//i', $value)>0)
-      {
-        return(substr($value,9));
+      elseif(preg_match('/^\.\/upload\//i', $value)>0)
+      {
+        return("U".substr($value,9));
       }
       return($value);