Changeset 20034 for extensions/edit_gmaps/admin

Timestamp:

Jan 10, 2013, 9:55:42 AM (11 years ago)

Author:

cljosse

Message:

[extensions] edit_gmaps Minor corrections

File:

• extensions/edit_gmaps/admin/admin_edit.php (modified) (8 diffs)

extensions/edit_gmaps/admin/admin_edit.php

@@ -53 +53 @@
 //========== Mode GLOBAL ================================
 
+
 check_input_parameter('selection', $_POST, true, PATTERN_ID);
 include (PHPWG_ROOT_PATH.'admin/batch_manager.php'); 
     $tabsheet = new tabsheet();
-    $tabsheet->assign(); 
-  
-
+    $tabsheet->assign();  
 
 if(isset($page['cat_elements_id'])) 
     $template->concat('TABSHEET_TITLE', ' '.l10n_dec('%d image', '%d images', count($page['cat_elements_id'])).' - '.$page['title']);  
 
- 
+
  if(isset($_POST)){
-// $info_message .= cl_edit_functions::Memo_Vars($_POST);
-
+// $info_message .= cl_print_var($_POST);
 //===============================================================
 $collection = array(); 
@@ -103 +101 @@
 $adresse =  $lang_info['country'];   ;
 $adresse=str_replace("/",", ",$adresse);
- 
+global $EDIT_CL_parametres ;
+ 
+$EDIT_CL_parametres = cl_edit_controler::cl_edit_Get_Options(); 
+
+
+$template->assign( 'coordinates',
+                    array(  'FILE' => '',
+                            'LAT' =>  ($EDIT_CL_parametres->lat =='')?'100': $EDIT_CL_parametres->lat,
+                            'LON' => ($EDIT_CL_parametres->lon =='')?'100':  $EDIT_CL_parametres->lon ,
+                            'ADRESSE' => ($EDIT_CL_parametres->adress =='')?$adresse:  $EDIT_CL_parametres->adress ,
+                            'ZOOM' => 18,
+                            'ALT' => $EDIT_CL_parametres->alt =='' ?0: $EDIT_CL_parametres->alt
+                        )
+                    );
+                  
 if (count($collection)>0 )
   if ( isset($_POST['update']) && ( $_POST['update']==l10n('update_exif') || $_POST['update'] == l10n('update_all')  )){
@@ -299 +311 @@
                 $j++ ;
             } else{
-            //   $info_message .= cl_edit_functions::Memo_Vars($current[$j]); 
+            //   $info_message .= cl_print_var($current[$j]); 
                 break ;
             }
@@ -342 +354 @@
 $match="";
 if ( isset($_POST['submit'])   ) {
-
+if ( isset($_POST['match']) && $_POST['match']!='' ){   
+      cl_edit_controler::cl_edit_Set_Options();
+      cl_edit_controler::cl_edit_sauve_options_inf();
+  }
  if ($_POST['submit']==l10n('selection') ) {
     $collection =$_POST['selection'];
   }
+
   if ($_POST['submit']==l10n('add') ) {
     $_POST['selection']=array();
@@ -359 +375 @@
 //=================================================================================
 $src=""; 
-$template->assign( 'coordinates',
-                    array(  'FILE' => '',
-                            'LAT' => '100',
-                            'LON' => '100',
-                            'ADRESSE' => $adresse,
-                            'ZOOM' => 18,
-                            'ALT' => 0
-                        )
-                    );
+
 //====================================================================== 
 if (isset($_POST['submit']) and $_POST['submit']==l10n('selection' )){
@@ -387 +395 @@
               $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']==''){  
+              
+              
+
+               if( ($image['lat']=='' || $image['lon']=='')|| $EDIT_CL_parametres->check_exif=='on' ) {                          
+                  if(isset($infos_gps['lat']) && $infos_gps['is_exif']){     
                         $image['lat']=$infos_gps['lat'];
                         $image['lon']=$infos_gps['lon'];
-                        $image['alt']=$infos_gps['alt'];             
-                }
-              }       
+                        $image['alt']=$infos_gps['alt']; 
+                  }  
+              }                      
+              if($image['lat'] <> ''){               
+                  $lon=$image['lon'];
+                  $lat=$image['lat'];   
+                  $alt=$image['alt'];   
+              }
               //==========================================
-                        
-              if ( $init_info && $image['lat'] <> '' ) {               
-
-                $init_info = false ;
-                $lat = ($image['lat'] <> '') ? $image['lat'] : '100'  ;
-                $lon = ($image['lon']  <> '') ? $image['lon'] : '3.0'  ;
-                $alt = ($image['alt']  <> '') ? $image['alt'] : '0'  ;
-                     
+              if ( $init_info && $image['lat'] <> '' ) {     
+                $init_info = false ;                     
                 //=====================================================
                 $template->assign( 'coordinates',
@@ -417 +426 @@
               }
               //===================================================== 
-                    $lon=$image['lon'];
-                    $lat=$image['lat'];
+                            
+
+
+
+
                     $lonDMS= dec2dms($lon) ;
                     $latDMS= dec2dms($lat) ;
@@ -456 +468 @@
 //============================================================
  if ( !empty($first_image)) { 
-   $erreur_message .= cl_edit_functions::Memo_Vars($first_image);
+   $erreur_message .= cl_print_var($first_image);
    
    if (isset($_POST['update'])) {