Changeset 26331 for extensions/rv_gmaps/trunk/admin/admin_boot.php

Timestamp:

Dec 29, 2013, 3:14:42 PM (10 years ago)

Author:

rvelices

Message:

rv_gmaps compatible with nez latitude/longitude fields in piwigo core 2.6

File:

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

extensions/rv_gmaps/trunk/admin/admin_boot.php

@@ -31 +31 @@
 {
         if ($prefilter==="geotagged")
-                $query = 'lat IS NOT NULL AND lon IS NOT NULL';
+                $query = 'latitude IS NOT NULL AND longitude IS NOT NULL';
         elseif ($prefilter==="not geotagged")
-                $query = 'lat IS NULL OR lon IS NULL';
+                $query = 'latitude IS NULL OR longitude IS NULL';
 
         if ( isset($query) )
@@ -74 +74 @@
                 if ( (double)$lat<=90 and (double)$lat>=-90
                                 and (double)$lon<=180 and (double)$lon>=-180 )
-                        $update_query = 'lat='.$lat.', lon='.$lon;
+                        $update_query = 'latitude='.$lat.', longitude='.$lon;
                 else
                         $page['errors'][] = 'Invalid lat or lon value';
         }
         elseif ( strlen($lat)==0 and strlen($lon)==0 )
-                $update_query = 'lat=NULL, lon=NULL';
+                $update_query = 'latitude=NULL, longitude=NULL';
         else
                 $page['errors'][] = 'Both lat/lon must be empty or not empty';
@@ -124 +124 @@
     $data = array(
       'id' => $row['id'],
-      'lat' => trim($_POST['lat-'.$row['id']]),
-      'lon' => trim($_POST['lon-'.$row['id']])
+      'latitude' => trim($_POST['lat-'.$row['id']]),
+      'longitude' => trim($_POST['lon-'.$row['id']])
     );
 
-    if ( strlen($data['lat'])>0 and strlen($data['lon'])>0 )
+    if ( strlen($data['latitude'])>0 and strlen($data['longitude'])>0 )
     {
-      if ( (double)$data['lat']>90 or (double)$data['lat']<-90
-          or (double)$data['lon']>180 or (double)$data['lon']<-180 )
+      if ( (double)$data['latitude']>90 or (double)$data['latitude']<-90
+          or (double)$data['longitude']>180 or (double)$data['longitude']<-180 )
         $error = true;
     }
-    elseif ( strlen($data['lat'])==0 and strlen($data['lon'])==0 )
+    elseif ( strlen($data['latitude'])==0 and strlen($data['longitude'])==0 )
     {
       // nothing
@@ -153 +153 @@
     array(
       'primary' => array('id'),
-      'update' => array('lat', 'lon')
+      'update' => array('latitude', 'longitude')
       ),
     $datas
@@ -183 +183 @@
       <td>
         <label>{\'Latitude\'|@translate}
-          <input type="text" size="8" name="lat-{$element.id}" value="{$element.lat}">
+          <input type="text" size="8" name="lat-{$element.id}" value="{$element.latitude}">
         </label>
         <label>{\'Longitude\'|@translate}
-          <input type="text" size="9" name="lon-{$element.id}" value="{$element.lon}">
+          <input type="text" size="9" name="lon-{$element.id}" value="{$element.longitude}">
         </label>
       </td>