Changeset 13092 for extensions/rv_gmaps/trunk/mapl.php

Timestamp:

Feb 11, 2012, 6:38:34 AM (12 years ago)

Author:

rvelices

Message:

rv_gmaps compatible with core version 2.4

File:

• extensions/rv_gmaps/trunk/mapl.php (modified) (5 diffs)

extensions/rv_gmaps/trunk/mapl.php

@@ -49 +49 @@
   $where_sql = rvm_bounds_to_sql( $page['box'] );
 
-$img_fields = ' i.id,i.tn_ext,i.name,i.path,i.lat,i.lon';
+$img_fields = ' i.id';
 
 $was_flat = @$page['flat'];
 $page['flat']=true;
 rvm_build_section_items($img_fields, $where_sql, RVM_BUILD_HASH, $order_by);
+$page['items']=array_keys($page['items']);
 if (!$was_flat) unset($page['flat']);
 
@@ -61 +62 @@
 {
 /* GENERATE THE CATEGORY LIST *************************************************/
-$where_sql = 'i.id IN ('.implode(',', array_keys($page['items']) ).')';
+$where_sql = 'i.id IN ('.implode(',', $page['items'] ).')';
 $where_sql .= get_sql_condition_FandF(
         array( 'forbidden_categories' => 'category_id' ),
@@ -95 +96 @@
 
 /* GENERATE THE TAG LIST ******************************************************/
-$tags = get_common_tags( array_keys($page['items']), $conf['content_tag_cloud_items_number'], null);
+$tags = get_common_tags( $page['items'], $conf['content_tag_cloud_items_number'], null);
 $tags = add_level_to_tags($tags);
 function counter_compare($a, $b)
@@ -145 +146 @@
   );
 
-foreach ($page['items'] as $img)
-{
-  $img['file'] = basename( $img['path'] );
-  $thumbnail_url = get_thumbnail_url($img);
+$pictures = array();
+if (count($page['items']) > 0)
+{
+  $rank_of = array_flip($page['items']);
+
+  $query = '
+SELECT *
+  FROM '.IMAGES_TABLE.'
+  WHERE id IN ('.implode(',', $page['items']).')
+;';
+  $result = pwg_query($query);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $row['rank'] = $rank_of[ $row['id'] ];
+    $pictures[] = $row;
+  }
+  usort($pictures, 'rank_compare');
+  unset($rank_of);
+}
+
+foreach ($pictures as $img)
+{
   $page_url = duplicate_picture_url(
         array(
@@ -157 +176 @@
         array('start')
       );
-  if (!empty( $img['name'] ) )
-    $title = $img['name'];
-  else
-    $title = str_replace('_', ' ', get_filename_wo_extension($img['file']));
-
-  $template->append(
-    'thumbnails',
-    array(
-      'TN_SRC'       => $thumbnail_url,
-      'URL'  => $page_url,
-      'TN_ALT'   => $img['file'],
-      'TN_TITLE'   => $title,
-      )
-    );
-}
+  $name = render_element_name($img);
+  $desc = render_element_description($img);
+
+  $tpl_thumbnails_var[] = array_merge( $img, array(
+                'NAME' => $name,
+    'TN_ALT' => htmlspecialchars(strip_tags($name)),
+    'TN_TITLE' => get_thumbnail_title($img, $name, $desc),
+    'URL' => $page_url,
+    'DESCRIPTION' => $desc,
+    'src_image' => new SrcImage($img),
+    ) );
+}
+$template->assign( array(
+  'derivative_params' => ImageStdParams::get_by_type(IMG_THUMB),
+  'SHOW_THUMBNAIL_CAPTION' => false,
+        'thumbnails' => $tpl_thumbnails_var,
+    ) );
+$template->set_filename('index_thumbnails', 'thumbnails.tpl');
+$template->assign_var_from_handle('THUMBNAILS', 'index_thumbnails');
 
 $title = $page['title'];