Changeset 13092 for extensions/rv_gmaps/trunk/admin

Timestamp:

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

Author:

rvelices

Message:

rv_gmaps compatible with core version 2.4

Location:

extensions/rv_gmaps/trunk/admin

Files:

• admin_edit.php (modified) (2 diffs)
• admin_sync.php (modified) (6 diffs)
• admin_sync.tpl (modified) (1 diff)

extensions/rv_gmaps/trunk/admin/admin_edit.php

@@ -116 +116 @@
 {
   $query='
-SELECT id,tn_ext,name,path,file,lat,lon FROM '.IMAGES_TABLE.'
+SELECT id,representative_ext,name,path,file,lat,lon FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',',$page['cat_elements_id']).')
   '.$conf['order_by'].'
@@ -130 +130 @@
         $tpl_var = array_merge( $image,
       array(
-        'U_TN' => get_thumbnail_url($image),
-        'TITLE' => get_thumbnail_title($image)
+        'U_TN' => DerivativeImage::thumb_url($image),
+        'TITLE' => render_element_name($image)
       )
     );

extensions/rv_gmaps/trunk/admin/admin_sync.php

@@ -5 +5 @@
   $sync_options = array(
     'simulate' => isset($_POST['simulate']),
-                'use_high' => isset($_POST['use_high']),
     'cat_id' => isset($_POST['cat_id']) ? (int)$_POST['cat_id'] : 0,
     'subcats_included' => isset($_POST['subcats_included']),
@@ -12 +11 @@
   $sync_options = array(
     'simulate' => true,
-                'use_high' => true,
     'cat_id' => 0,
     'subcats_included' => true,
@@ -35 +33 @@
 
     $query='
-SELECT id,path,lat,lon,has_high
+SELECT id,path,lat,lon
   FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id=image_id
   WHERE category_id IN ('.implode(',', $cat_ids).')
@@ -43 +41 @@
   {
     $query='
-SELECT id,path,lat,lon,has_high
+SELECT id,path,lat,lon
   FROM '.IMAGES_TABLE;
   }
@@ -53 +51 @@
   {
                 $filename = $image['path'];
-                if ($sync_options['use_high'] and $image['has_high']=='true')
-                        $filename = get_high_path($image);
                 $exif = @read_exif_data( $filename );
                 if ( empty($exif) )
@@ -110 +106 @@
     array(
       'SUBCATS_INCLUDED_CHECKED' => $sync_options['subcats_included'] ? 'checked="checked"' : '',
-                        'USE_HIGH_CHECKED' => $sync_options['use_high'] ? 'checked="checked"' : ''
     )
   );

extensions/rv_gmaps/trunk/admin/admin_sync.tpl

@@ -27 +27 @@
     <ul>
       <li><label><input type="checkbox" name="simulate" value="1" checked="checked" /> {'only perform a simulation (no change in database will be made)'|@translate}</label></li>
-                        <li><label><input type="checkbox" name="use_high" value="1" {$USE_HIGH_CHECKED} /> use high resolution images if available</label></li>
     </ul>
   </fieldset>