Changeset 18951

Timestamp:

Nov 6, 2012, 9:55:00 PM (12 years ago)

Author:

rvelices

Message:

rv_gmaps ready for piwigo 2.5

Location:

extensions/rv_gmaps/trunk

Files:

• admin/admin_boot.php (modified) (2 diffs)
• changelog.txt (modified) (1 diff)
• main.inc.php (modified) (3 diffs)

extensions/rv_gmaps/trunk/admin/admin_boot.php

@@ -172 +172 @@
 
   $template->set_prefilter('batch_manager_unit', 'rvm_prefilter_batch_manager_unit');
-
-  if (empty($page['cat_elements_id']))
-    return;
-
-  $query = '
-SELECT id,lat,lon
-  FROM '.IMAGES_TABLE;
-
-  if ($is_category)
-  {
-    $category_info = get_cat_info($_SESSION['bulk_manager_filter']['category']);
-
-    $conf['order_by'] = $conf['order_by_inside_category'];
-    if (!empty($category_info['image_order']))
-    {
-      $conf['order_by'] = ' ORDER BY '.$category_info['image_order'];
-    }
-
-    $query.= '
-    JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id';
-  }
-
-  $query.= '
-  WHERE id IN ('.implode(',', $page['cat_elements_id']).')';
-
-  if ($is_category)
-  {
-    $query.= '
-    AND category_id = '.$_SESSION['bulk_manager_filter']['category'];
-  }
-
-  $query.= '
-  '.$conf['order_by'].'
-  LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].'
-;';
-  $result = pwg_query($query);
-
-  $tpl_vars = array();
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    // remove last zeros for better display
-    $row['lat'] = preg_replace('#\.([0-9]*?)([0]+)$#', '.$1', $row['lat']);
-    $row['lon'] = preg_replace('#\.([0-9]*?)([0]+)$#', '.$1', $row['lon']);
-
-    $tpl_vars[ $row['id'] ] = array(
-      'LAT' => rtrim($row['lat'], '.'),
-      'LON' => rtrim($row['lon'], '.'),
-      );
-  }
-
-  $template->assign('GEOTAG', $tpl_vars);
 }
 
@@ -234 +183 @@
       <td>
         <label>{\'Latitude\'|@translate}
-          <input type="text" size="8" name="lat-{$element.ID}" value="{$GEOTAG[$element.ID].LAT}">
+          <input type="text" size="8" name="lat-{$element.id}" value="{$element.lat}">
         </label>
         <label>{\'Longitude\'|@translate}
-          <input type="text" size="9" name="lon-{$element.ID}" value="{$GEOTAG[$element.ID].LON}">
+          <input type="text" size="9" name="lon-{$element.id}" value="{$element.lon}">
         </label>
       </td>

extensions/rv_gmaps/trunk/changelog.txt

@@ +1 @@
+2.5.a
+- piwigo 2.5
+
 2.4.g
 - added missing trigger on category name translation...

extensions/rv_gmaps/trunk/main.inc.php

@@ -1 +1 @@
 <?php /*
 Plugin Name: RV Maps&Earth
-Version: 2.4.g
+Version: 2.5.a
 Description: Extend your gallery with Google Maps and Google Earth ...
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=122
@@ -7 +7 @@
 Author URI: http://www.modusoptimus.com/
 */
-define( 'RVM_PLUGIN_VERSION', '2.4.f');
+define( 'RVM_PLUGIN_VERSION', '2.5.a');
 defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
 
@@ -101 +101 @@
                         global $rvm_dir;
                         $map_url = rvm_duplicate_map_picture_url();
-                        $link_title = sprintf( l10n('displays %s on a map'), strip_tags($pictures['current']['name']) );
+                        $link_title = sprintf( l10n('displays %s on a map'), strip_tags($pictures['current']['TITLE']) );
                         $template->concat( 'PLUGIN_PICTURE_ACTIONS' , sprintf(RVM_ACTION_MODEL,
                                         $map_url, $link_title, ' target="_top"', 'map', l10n('Map')