Changeset 17780

Timestamp:

Sep 6, 2012, 10:24:41 PM (12 years ago)

Author:

rvelices

Message:

rv_gmaps fixes when compile_template_cache_language=true (prefilter fails and lat/lon data destroyed)

File:

• extensions/rv_gmaps/trunk/admin/admin_boot.php (modified) (6 diffs)

extensions/rv_gmaps/trunk/admin/admin_boot.php

@@ -53 +53 @@
         $template->append('element_set_global_plugins_actions',
                 array('ID' => 'geotag', 'NAME'=>l10n('Geotag'), 'CONTENT' => '
-  <label>{\'Latitude\'|@translate} (-90=S to 90=N)
+  <label>'.l10n('Latitude').' (-90=S to 90=N)
     <input type="text" size="8" name="lat">
   </label>
-  <label>{\'Longitude\'|@translate} (-180=E to 180=W)
+  <label>'.l10n('Longitude').' (-180=E to 180=W)
     <input type="text" size="9" name="lon">
   </label> (Empty values will erase coordinates)
@@ -97 +97 @@
 {
   global $page;
-  
-  if (isset($_POST['submit']))
-  {
-    $collection = explode(',', $_POST['element_ids']);
-    
-    $datas = array();
-    $errors = array();
-    
-    $query = '
+
+  if (!isset($_POST['submit']))
+    return;
+
+  $collection = explode(',', $_POST['element_ids']);
+
+  $datas = array();
+  $errors = array();
+  $form_errors = 0;
+
+  $query = '
 SELECT id, name
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', $collection).')
 ;';
-    $result = pwg_query($query);
-    
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      $data = array();
-      $error = false;
-      $data['id'] = $row['id'];
-      $data['lat'] = trim($_POST['lat-'.$row['id']]);
-      $data['lon'] = trim($_POST['lon-'.$row['id']]);
-      
-      if ( strlen($data['lat'])>0 and strlen($data['lon'])>0 )
-      {
-        if ( (double)$data['lat']>90 or (double)$data['lat']<-90
-            or (double)$data['lon']>180 or (double)$data['lon']<-180 )
-          $error = true;
-      }
-      elseif ( strlen($data['lat'])==0 and strlen($data['lon'])==0 )
-      {
-        // nothing
-      }
-      else
-      {
+  $result = pwg_query($query);
+
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    if (!isset($_POST['lat-'.$row['id']]))
+    {
+      $form_errors++;
+      continue;
+    }
+    $error = false;
+    $data = array(
+      'id' => $row['id'],
+      'lat' => trim($_POST['lat-'.$row['id']]),
+      'lon' => trim($_POST['lon-'.$row['id']])
+    );
+
+    if ( strlen($data['lat'])>0 and strlen($data['lon'])>0 )
+    {
+      if ( (double)$data['lat']>90 or (double)$data['lat']<-90
+          or (double)$data['lon']>180 or (double)$data['lon']<-180 )
         $error = true;
-      }
-      
-      if ($error)
-        array_push($errors, $row['name']);
-      else
-        array_push($datas, $data);
-    }
-    
-    mass_updates(
-      IMAGES_TABLE,
-      array(
-        'primary' => array('id'),
-        'update' => array('lat', 'lon')
-        ),
-      $datas
-      );
-    
-    if (count($errors)>0)
-    {
-      array_push($page['errors'], 'Invalid lat or lon value for files: '.implode(', ', $errors));
-    }
-  }
+    }
+    elseif ( strlen($data['lat'])==0 and strlen($data['lon'])==0 )
+    {
+      // nothing
+    }
+    else
+    {
+      $error = true;
+    }
+
+    if ($error)
+      $errors[] = $row['name'];
+    else
+      $datas[] = $data;
+  }
+
+  mass_updates(
+    IMAGES_TABLE,
+    array(
+      'primary' => array('id'),
+      'update' => array('lat', 'lon')
+      ),
+    $datas
+    );
+
+  if (count($errors)>0)
+  {
+    $page['errors'][] = 'Invalid lat or lon value for files: '.implode(', ', $errors);
+  }
+  if ($form_errors)
+    $page['errors'][] = 'Maps & Earth: Invalid form submission for '.$form_errors.' photos';
 }
 
@@ -161 +170 @@
 {
   global $template, $conf, $page, $is_category, $category_info;
-  
+
+  $template->set_prefilter('batch_manager_unit', 'rvm_prefilter_batch_manager_unit');
+
   $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']))
@@ -201 +212 @@
     $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'], '.'),
@@ -207 +218 @@
       );
   }
-  
+
   $template->assign('GEOTAG', $tpl_vars);
-  
-  $template->set_prefilter('batch_manager_unit', 'rvm_prefilter_batch_manager_unit');
-}
-
-function rvm_prefilter_batch_manager_unit($content, &$smarty)
-{
-  $search = '<td><strong>{\'Who can see this photo?\'|@translate}</strong></td>';
-  $add = '<td><strong>{\'Geotag\'|@translate}</strong></td>
+}
+
+function rvm_prefilter_batch_manager_unit($content)
+{
+  $needle = '</table>';
+  $pos = strpos($content, $needle);
+  if ($pos!==false)
+  {
+    $add = '<tr><td><strong>{\'Geotag\'|@translate}</strong></td>
       <td>
         <label>{\'Latitude\'|@translate}
@@ -225 +237 @@
         </label>
       </td>
-    </tr>
-
-    <tr>
-      ';
-  return str_replace($search, $add.$search, $content);
+    </tr>';
+    $content = substr_replace($content, $add, $pos, 0);
+  }
+  return $content;
 }
 ?>