Changeset 15345 for extensions/GMaps/gmaps_ajax.php

Timestamp:

May 27, 2012, 2:04:11 PM (12 years ago)

Author:

grum

Message:

feature:2638 - Compatibility with Piwigo 2.4

File:

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

extensions/GMaps/gmaps_ajax.php

@@ -21 +21 @@
   // in this case, PHPWG_ROOT_PATH must be declared as an absolute path...
   define('PHPWG_ROOT_PATH',dirname(dirname(dirname(__FILE__))).'/');
-
   /*
    * set ajax module in admin mode if request is used for admin interface
@@ -1200 +1199 @@
                    GROUP_CONCAT(DISTINCT IF(pct.permalink IS NULL, CONCAT('*', pct.id), pct.permalink) ORDER BY pct.id SEPARATOR ';') AS imageCatsPLink,
                    pit.name AS imageName,
-                   pit.path, pit.tn_ext
+                   pit.path
             FROM (((".$this->tables['cache']." pgc
                     LEFT JOIN ".IMAGE_CATEGORY_TABLE." pic ON pic.image_id = pgc.imageId)
@@ -1231 +1230 @@
         {
           $row['imageName']  =GPCCore::getUserLanguageDesc($row['imageName']);
-          $row['imageTnFile']=dirname($row['path']).'/'.$conf['dir_thumbnail'].'/'.$conf['prefix_thumbnail'].get_filename_wo_extension(basename($row['path'])).'.'.$row['tn_ext'];
+          $row['imageTnFile']=str_replace(PHPWG_ROOT_PATH, './', DerivativeImage::thumb_url(array('id'=>$row['imageId'], 'path'=>$row['path'])));
           if(!$this->checkInGroup($row, $groups, $datas['distanceTreshold']))
           {
@@ -1265 +1264 @@
             {
               $tmpCatsNames[$key]=GPCCore::getUserLanguageDesc(substr($tmpCatsNames[$key],7));
-
-              $tmpCatsUrl[]=make_picture_url(
-                array(
-                  'image_id' => $point['imageId'],
-                  'category' => array(
-                    'id' => $id,
-                    'name' => $tmpCatsNames[$key],
-                    'permalink' => (substr($tmpCatsPLinks[$key],0,1)=='*')?'':$tmpCatsPLinks[$key],
+              $tmpCatsUrl[]=$this->replaceRoot(str_replace(PHPWG_ROOT_PATH, './',
+                make_picture_url(
+                  array(
+                    'image_id' => $point['imageId'],
+                    'category' => array(
+                      'id' => $id,
+                      'name' => $tmpCatsNames[$key],
+                      'permalink' => (substr($tmpCatsPLinks[$key],0,1)=='*')?'':$tmpCatsPLinks[$key],
+                    )
                   )
                 )
-              );
+              ));
             }
 
@@ -1285 +1285 @@
             $coords['lng']+=$point['longitude'];
 
-            $coords['imgTn'][]=$this->replaceImgRoot($point['imageTnFile']);
+            $coords['imgTn'][]=$this->replaceRoot($point['imageTnFile']);
             $coords['imgCatsNames'][]=$tmpCatsNames;
             $coords['imgName'][]=GPCCore::getUserLanguageDesc($point['imageName']);
@@ -1348 +1348 @@
     /**
      * replace the root directroy for image
-     *  => './galleries/' becomes "G"
-     *  => './upload/' becomes "U"
+     *  => './_data/i/galleries/' becomes "G"
+     *  => './i.php?/galleries/' becomes "I"
+     *  => './picture.php?/' becomes "P"
      *  => other case : no chnages
      *
@@ -1355 +1356 @@
      * @returned String :
      */
-    private function replaceImgRoot($value)
-    {
-      if(preg_match('/^\.\/galleries\//i', $value)>0)
-      {
-        return("G".substr($value,12));
-      }
-      elseif(preg_match('/^\.\/upload\//i', $value)>0)
-      {
-        return("U".substr($value,9));
+    private function replaceRoot($value)
+    {
+      if(preg_match('/^\.\/_data\/i\/galleries\//i', $value)>0)
+      {
+        return("G".substr($value,20));
+      }
+      if(preg_match('/^\.\/i\.php\?\/galleries\//i', $value)>0)
+      {
+        return("I".substr($value,19));
+      }
+      if(preg_match('/^\.\/picture\.php\?\//i', $value)>0)
+      {
+        return("P".substr($value,15));
       }
       return($value);