Changeset 26331 for extensions/rv_gmaps/trunk/admin

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

Location:

extensions/rv_gmaps/trunk/admin

Files:

• admin.php (modified) (1 diff)
• admin_boot.php (modified) (5 diffs)
• admin_config.php (modified) (3 diffs)
• admin_config.tpl (modified) (2 diffs)
• admin_sync.php (deleted)
• admin_sync.tpl (deleted)

extensions/rv_gmaps/trunk/admin/admin.php

@@ -14 +14 @@
 $tabsheet = new tabsheet();
 $tabsheet->add( 'config', 'Configuration', add_url_params( $my_base_url, array('tab'=>'config') ) );
-$tabsheet->add( 'sync', 'Synchronize', add_url_params( $my_base_url, array('tab'=>'sync') ) );
 $tabsheet->select($page['tab']);
 

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>

extensions/rv_gmaps/trunk/admin/admin_config.php

@@ -17 +17 @@
   }
 
-  if (isset($_POST['gmaps_auto_sync']))
-  {
-    conf_update_param('gmaps_auto_sync', "1");
-    $conf['gmaps_auto_sync']=1;
-  }
-  else
-  {
-    $query = 'DELETE FROM '.CONFIG_TABLE.' WHERE param="gmaps_auto_sync"';
-    pwg_query($query);
-    unset($conf['gmaps_auto_sync']);
-  }
-  
   $gm_config = rvm_get_config();
 
@@ -52 +40 @@
 }
 
-$query = 'SELECT COUNT(*) FROM '.IMAGES_TABLE.' WHERE lat IS NOT NULL';
+$query = 'SELECT COUNT(*) FROM '.IMAGES_TABLE.' WHERE latitude IS NOT NULL';
 list($nb_geotagged) = pwg_db_fetch_array( pwg_query($query) );
 
@@ -59 +47 @@
       'NB_GEOTAGGED' => $nb_geotagged,
       'GMAPS_API_KEY' => $conf['gmaps_api_key'],
-      'GMAPS_AUTO_SYNC' => isset($conf['gmaps_auto_sync']) ? 1:0,
       'NB_MARKERS' => rvm_get_config_var('nb_markers',40),
       'NB_IMAGES_PER_MARKER' => rvm_get_config_var('nb_images_per_marker',20),

extensions/rv_gmaps/trunk/admin/admin_config.tpl

@@ -16 +16 @@
         <br/> -->
 
-        <li>
+        <!--<li>
          <label>
                 Automatically sync from exif
@@ -23 +23 @@
                 <br/><small>When metadata is synchronized, tour manual set coordinates might be overriden.</small>
         </li>
-        <br/>
+        <br/> -->
 
   <li>