Changeset 17779 for extensions/edit_gmaps/admin

Timestamp:

Sep 6, 2012, 5:44:55 PM (12 years ago)

Author:

cljosse

Message:

[extensions] edit_gmaps compatibility 2.4 memory locations

Location:

extensions/edit_gmaps/admin

Files:

• admin_edit.php (modified) (9 diffs)
• admin_edit.tpl (modified) (1 diff)

extensions/edit_gmaps/admin/admin_edit.php

@@ -104 +104 @@
 if (count($collection)>0 )
   if (isset($_POST['update']) && $_POST['update']==l10n('update_exif')){
-    /******************************* 
+    /*********************************** 
     *  Mise à jour des meta données 
-    *******************************/
+    ************************************/
     // error_reporting ( 0 );
     // Hide any unknown EXIF tags   
@@ -141 +141 @@
               //=================================================================
                 $infos_gps  = array();
-                $infos_gps  = cl_edit_controler::Get_exif_gps( $image['path'],$image,false) ;
+                $lat = trim($_POST['lat']);
+                $lon = trim($_POST['lon']);
+                $alt = '';
+      if(isset($_POST['alt']))
+                $alt = trim($_POST['alt']);
+
+                if($image['lat']=='' || $image['lon']==''){ 
+                    $image['lat']=$lat;
+                    $image['lon']=$lon;
+                    $image['alt']=$alt;
+                }     
+                $infos_gps  = cl_edit_controler::Get_exif_gps( $image['path'],$image,false,true) ; 
+
                 if($image['lat']=='' || $image['lon']==''){ 
                     $image['lat']=$infos_gps['lat'];
@@ -165 +177 @@
            if(  cl_edit_controler::add_meta_gps($new_ps_file_info_array,$image)){
                   $exif = @read_exif_data( $image['path']);
-                  $infos_gps  = cl_edit_controler::Get_exif_gps( $image['path'],$image,false) ;
-                  $info_message .=l10n('update_exif') . ": " .  $image['path'] . " : " . $image['file'] . " : ok<BR />";
+                  $infos_gps  = cl_edit_controler::Get_exif_gps( $image['path'],$image,false,true) ;
+                  $info_message .=l10n('update_exif') . " : " .  $image['path'] . " : " . $image['file'] . " : ok<BR />";
                 }else{
 
@@ -191 +203 @@
        if($lat !="") cl_edit_controler::add_data_base($collection,$lat,$lon,$alt) ;
         $_POST['submit'] = l10n('selectAction') ;
+        unset($_POST['submit']);
         foreach ($collection as $id_0){
           foreach ($images as $image) {  
             if (array_search($id_0,$image)) {  
-              $image['lat'] =    $lat ;
-              $image['lon']= $lon  ;
-              $image['alt'] =$alt  ;
+              $image['lat'] = $lat ;
+              $image['lon']=  $lon  ;
+              $image['alt'] = $alt  ;
            }
           }
@@ -234 +247 @@
 //========================================================================
   $v_exif="";
- $current = $template->get_template_vars('thumbnails');  
- $j=0;
- $thumbnails= array();
-foreach ($images as $image){  
+  $current = $template->get_template_vars('thumbnails');  
+  $j=0;
+  $thumbnails= array();
+/*************************************
+* AFFICHAGE MODE GLOBAL
+*************************************/
+  foreach ($images as $image){  
     $infos_gps  = array();
-    $infos_gps  =  cl_edit_controler::Get_exif_gps( $image['path'],$image,false) ;
+    $infos_gps  =  cl_edit_controler::Get_exif_gps( $image['path'],$image,false,false) ;
+    
     $v_exif=$infos_gps['is_exif']?"EXIF":"NO" ;   
     $v_db=false  ; 
@@ -252 +269 @@
       $sel_img= array($image['id']);
       if ($new){ 
-
-              cl_edit_controler::add_data_base( $sel_img,$image['lat'],$image['lon'],$image['alt']) ; 
+           cl_edit_controler::add_data_base( $sel_img,$image['lat'],$image['lon'],$image['alt']) ; 
       }            
    }         
@@ -347 +363 @@
         foreach ($images as $image) {
             if (array_search($id_0,$image)) {    
-              $infos_gps  = array();   
-              if($image['lat']=='' || $image['lon']==''){    }
+
+              $infos_gps  = array();                
               $infos_gps  =array();
-              $infos_gps  =  cl_edit_controler::Get_exif_gps( $image['path'],$image,false) ;
-              if(isset($infos_gps['lat']) && $infos_gps['is_exif']){        
-                $image['lat']=$infos_gps['lat'];
-                $image['lon']=$infos_gps['lon'];
-                $image['alt']=$infos_gps['alt'];
-              }                    
-              if ( $init_info && $image['lat'] <> '' ) {
+              $infos_gps  =  cl_edit_controler::Get_exif_gps( $image['path'],$image,false,false) ;            
+               
+              if(isset($infos_gps['lat']) && $infos_gps['is_exif']){     
+              //======= test affichage BD ================
+                if($image['lat']=='' || $image['lon']==''){  
+                        $image['lat']=$infos_gps['lat'];
+                        $image['lon']=$infos_gps['lon'];
+                        $image['alt']=$infos_gps['alt'];             
+                }
+              }       
+              //==========================================
+                        
+              if ( $init_info && $image['lat'] <> '' ) {               
+
                 $init_info = false ;
                 $lat = ($image['lat'] <> '') ? $image['lat'] : '100'  ;
@@ -381 +404 @@
                     $v_db=false  ; 
                     $v_db=$lon!=0 && $lat!=0;
+
                     $tpl_var = array_merge(
                         $image,
@@ -424 +448 @@
      if (!empty($infos_gps))
          $Position = $infos_gps ;
-     else  $Position =  cl_edit_controler::Get_exif_gps($filename,$image,false) ;
+     else  
+         $Position =  cl_edit_controler::Get_exif_gps($filename,$image,false,true) ;
 
       $jpeg_header_data = get_jpeg_header_data($filename );

extensions/edit_gmaps/admin/admin_edit.tpl

@@ -77 +77 @@
    title="{'selection'|@translate}|{'hlp_line3'|@translate}.";   
    value="{'selection'|@translate}" ;
-   message='<p><input class="cluetip submit" type="submit" name="submit"   title="'+ title +'" value="'+ value +'"  /> ';
+   message ='<p><input class="cluetip submit" type="submit" name="submit"   title="'+ title +'" value="'+ value +'"  /> ';
+
+
+
+   title="{'update_exif'|@translate}|{'hlp_line3'|@translate}.";   
+   value="{'update_exif'|@translate}" ;
+   message +='<input class="cluetip submit" type="submit" name="update"   title="'+ title +'" value="'+ value +'"  /> ';
 
    message+='</p>';
+
   jQuery("#permitAction").append(message);