Changeset 18635 for extensions/edit_gmaps

Timestamp:

Oct 13, 2012, 4:29:38 PM (12 years ago)

Author:

cljosse

Message:

[extensions] edit_gmaps compatibility 2.4.4 fix bug on global batch_manager

Location:

extensions/edit_gmaps

Files:

• admin/admin.php (modified) (2 diffs)
• admin/admin_edit.php (modified) (13 diffs)
• admin/admin_edit.tpl (modified) (4 diffs)
• admin/js/JScript.js (modified) (1 diff)
• language/fr_FR/lang.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)

extensions/edit_gmaps/admin/admin.php

@@ -9 +9 @@
 else
   $page['tab'] = $_GET['tab'];
-
+ 
    $page['tab'] = 'edit';
 $my_base_url = get_admin_plugin_menu_link(__FILE__);
@@ -18 +18 @@
             ));
 
-          
-
 include_once( dirname(__FILE__).'/admin_'.$page['tab'].'.php'); 
 $template->assign_var_from_handle( 'BATCH_MANAGER_GLOBAL', 'batch_manager_global');
 $template->assign_var_from_handle( 'TAB_DATA', 'tab_data');
 $current  =  $template->get_template_vars('BATCH_MANAGER_GLOBAL');  
-    $template->concat('TAB_DATA', $current);  
-
+$template->concat('TAB_DATA', $current);  
+;
 
 

extensions/edit_gmaps/admin/admin_edit.php

@@ -24 +24 @@
 $icon_path = 'themes/default/icon/help.png';
 $path_js=  'themes/default/js/' ;
+ 
  
 $global_tpl=realpath(PHPWG_ROOT_PATH).'\\admin\\themes\\default\\template\\batch_manager_global.tpl' ;
@@ -41 +42 @@
 /****************************************************************/
 if ( !isset($_GET['mode']) ) $_GET['mode'] = 'global';
-if(!isset($_GET['cat'])) $_GET['cat']="" ;
+
+//  if(!isset($_GET['cat'])) $_GET['cat']=" " ;
 if(isset($_POST['filter_prefilter'])){
   $_GET['cat'] = $_POST['filter_prefilter']; 
 }
-
+ 
 if (!isset($page['title'])) $page['title']="";
 if(!isset($_POST['selectAction'])) $_POST['selectAction']="" ;
-//$info_message .= cl_edit_functions::Memo_Vars($_POST);
+
 //========== Mode GLOBAL ================================
+
 check_input_parameter('selection', $_POST, true, PATTERN_ID);
 include (PHPWG_ROOT_PATH.'admin/batch_manager.php'); 
@@ -57 +60 @@
 
 
-
 if(isset($page['cat_elements_id'])) 
     $template->concat('TABSHEET_TITLE', ' '.l10n_dec('%d image', '%d images', count($page['cat_elements_id'])).' - '.$page['title']);  
@@ -63 +65 @@
  
  if(isset($_POST)){
-//  $info_message .= cl_edit_functions::Memo_Vars($_POST);
+// $info_message .= cl_edit_functions::Memo_Vars($_POST);
 
 //===============================================================
@@ -103 +105 @@
  
 if (count($collection)>0 )
-  if (isset($_POST['update']) && $_POST['update']==l10n('update_exif')){
+  if ( isset($_POST['update']) && ( $_POST['update']==l10n('update_exif') || $_POST['update'] == l10n('update_all')  )){
     /*********************************** 
     *  Mise à jour des meta données 
@@ -132 +134 @@
       $init_info =true;
       $first_image="";   
-      $_POST['submit']="";
-
+     
       foreach ($collection as $id_0){
           foreach ($images as $image) {  
@@ -140 +141 @@
               // Meta donnée
               //=================================================================
-                $infos_gps  = array();
-                $lat = trim($_POST['lat']);
-                $lon = trim($_POST['lon']);
-                $alt = '';
-      if(isset($_POST['alt']))
-                $alt = trim($_POST['alt']);
-
-                if($image['lat']=='' || $image['lon']==''){ 
+
+                  $lat =(isset($_POST['lat']) && $_POST['lat']  )!=''  ?trim($_POST['lat']):$image['lat'];
+                  $lon = (isset($_POST['lon']) && $_POST['lon'] )!=''  ?trim($_POST['lon']):$image['lon'];
+                  $alt =(isset($_POST['alt']) && $_POST['alt']  )!=''?trim($_POST['alt']):$image['alt'];
+
+                //========== Mise à jour $image =============               
                     $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'];
-                    $image['lon']=$infos_gps['lon'];
-                    $image['alt']=$infos_gps['alt'];
-                }     
-
-                if($image['lat']!=''){
-                      $new_ps_file_info_array=  base_to_meta($image);
-                  }
+              //==== lecture info gps ====
+                    $infos_gps  = array();    
+                   if ( isset($_POST['lat']) && $_POST['lat']  !=''){
+                  } else{              
+                      $infos_gps  = cl_edit_controler::Get_exif_gps( $image['path'],$image,false,true) ;  
+                      if($infos_gps['lat']!=0){
+                          $image['lat']=$infos_gps['lat'];
+                          $image['lon']=$infos_gps['lon'];   
+                      }
+                      }
+                $new_ps_file_info_array =  base_to_meta($image);
 
                 $new_ps_file_info_array['filename'] =  $image['path'];
                 $new_ps_file_info_array['selection'] = explode(";",$new_ps_file_info_array['filename']);
-   //   
+ 
           if( $image['lat']=="" ){
               $image['lat']=  $new_ps_file_info_array['lat'] ;
@@ -172 +170 @@
               $image['alt']=  $new_ps_file_info_array['alt'] ; 
           }
-        if($_POST['update']==l10n('update_exif')) unset($_POST['submit']);
-        if(1) {
- 
-           if(  cl_edit_controler::add_meta_gps($new_ps_file_info_array,$image)){
-                  $exif = @read_exif_data( $image['path']);
+
+          
+      
+
+           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,true) ;
                   $info_message .=l10n('update_exif') . " : " .  $image['path'] . " : " . $image['file'] . " : ok<BR />";
-                }else{
-
-                }
-           }
+                } 
+            
         }else{
          
         } // fin search
+
       }   // fin id_0
-    }     // fin collection     
+
+
+
+    }     // fin collection    
+  
+      if($_POST['update']==l10n('update_exif')) {
+          unset($_POST['submit']);
+       }
+         if ($_POST['update']==l10n('update_all')){
+            $_POST['submit'] = l10n('update_database') ;
+
+            }
+
     $_POST['update'] ="ok";
+    
   }
 //======================================================================
@@ -214 +225 @@
         }  
       }
+        $_POST['submit'] = l10n('selectAction') ;
+        unset($_POST['submit']);
     }
  }
@@ -224 +237 @@
 $categories = array();
 $selecteds = array();
+if(!isset($_GET['cat'])) $_GET['cat']="tag-no";
 if (!empty($result)){
   while ($row = mysql_fetch_assoc($result))  {
     $url = $admin_url.get_query_string_diff(array('start','cat')).'&amp;cat='.$row['id'];
+ 
     if ( $row['id']==$_GET['cat'] ) $selecteds[] = $url;
     $row['id']=$url;
+   
     array_push($categories, $row);
   }
 }
+
 usort($categories, 'global_rank_compare');
 display_select_categories($categories, $selecteds, 'categories', false);
@@ -253 +270 @@
 * AFFICHAGE MODE GLOBAL
 *************************************/
+
   foreach ($images as $image){  
     $infos_gps  = array();
@@ -288 +306 @@
   //================================================= 
   
- $TN_SRC= $current[$j]['TN_SRC'];
+ $TN_SRC= $current[$j]['thumb'];
  $TITLE=$current[$j]['TITLE'] ;
  
-   $tpl_var = array(
-                  'ID' =>$image['id'],
+   $tpl_var = array( 
+                  'id' =>$image['id'],
                   'TN_SRC' => $TN_SRC,
-                  'FILE' => $current[$j]['FILE'],
+                  'file' => $current[$j]['FILE'],
                    'TITLE' => $TITLE,
                   'LEVEL' =>  $current[$j]['LEVEL'],
@@ -303 +321 @@
                   'alt' =>     $image['alt']    ,   
                   'U_EXIF' => $v_exif ,
-                  'U_BD' =>  $v_db  
+                  'U_BD' =>  $v_db  ,
+                  'thumb' =>$current[$j]['thumb']
                    );
              

extensions/edit_gmaps/admin/admin_edit.tpl

@@ -40 +40 @@
  border:outset;
 }
-.thumbLegend { color:grey;
-
-}
-.thumbLegend:hover { color:white ;
-
-}
+ 
 {/literal}
 </style>
@@ -61 +56 @@
 var  infos_img = infos_img || [];
         {foreach from=$thumbnails item=thumbnail}
-  infos_img[{$thumbnail.ID}]={ldelim}EXIF:"{$thumbnail.U_EXIF}",
+  infos_img[{$thumbnail.id}]={ldelim}EXIF:"{$thumbnail.U_EXIF}",
                               BD:"{$thumbnail.U_BD}",
                               lon:"{$thumbnail.lon}",
@@ -128 +123 @@
 
    <fieldset>
-    <label>{'command'|@translate}</label>
+    <label>{'command_cl'|@translate}</label>
 
                 <table>
@@ -203 +198 @@
                         <input class="cluetip submit" title="{'update_exif'|@translate}|{'hlp_update_exif'|@translate}." type="submit" value="{'update_exif'|@translate}" name="update" {$tag_input_enabled} /></td>
                         </td>            
+                        <td>
+                        <input class="cluetip submit" title="{'update_all'|@translate}|{'hlp_update_all'|@translate}." type="submit" value="{'update_all'|@translate}" name="update" {$tag_input_enabled} /></td>
+                        </td>           
+
         </table> 
     </fieldset>

extensions/edit_gmaps/admin/js/JScript.js

@@ -48 +48 @@
     }
   });
-
+   
   jQuery(".thumbLegend").mouseover(function (i) {
     winp = infos_img[this.id];

extensions/edit_gmaps/language/fr_FR/lang.php

@@ -1 +1 @@
 <?php
 global $lang;
+$lang['command_cl']="Lecture : Base de données, Exif";
 $lang['return']="Retour";
 $lang['hlp_line4'] .= "Modifie la sélection.";  
 $lang['update']='Mise à jour ';
 $lang['update_exif']='Mise à jour EXIF';
+$lang['update_all']='Mise à jour EXIF & base de données';
+
 $lang['update_database']='Mise à jour Base de données';
 $lang['altitude']='Altitude';
@@ -16 +19 @@
 $lang['hlp_update_exif']='Met à jour les informations enregistrées dans les metadonnées "exif" des fichier jpeg. ';
 $lang['hlp_update_database']='Met à jour les informations enregistrées dans la base de données.';
-
+$lang['hlp_update_all']="Met à jour les informationsdans la base de données et dans les metadonnées 'Exif'. ";
 
 $lang['search_title']='Rechercher un lieu...';

extensions/edit_gmaps/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Edit Maps&Earth
-Version: 2.2.5
+Version: 2.2.6
 Description:  Editor for rv gmaps 
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=330