7 files changed, 4 insertions, 103 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 2d8ae2ba6..8453dad73 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1697,97 +1697,6 @@ SELECT image_id
 }
 
 /**
- * Create an XML file with Piwigo informations about a list of
- * pictures.
- *
- * The goal of the export feature is to make easier the reading of
- * informations related to pictures outside of Piwigo.
- *
- * @param array image_ids
- */
-function export_pwg_data($image_ids)
-{
-  global $conf;
-
-  if (count($image_ids) == 0)
-  {
-    return;
-  }
-
-  $fp = fopen($conf['export_file'], 'w');
-  $xml_string = '<export>'."\n";
-
-  $query = '
-SELECT tag_id,
-       image_id
-  FROM '.IMAGE_TAG_TABLE.'
-  WHERE image_id IN ('.implode(',', $image_ids).')
-;';
-  $result = pwg_query($query);
-  $tags_of = array();
-  $all_tag_ids = array();
-  $tag_name_of = array();
-
-  if (mysql_num_rows($result))
-  {
-      while ($row = mysql_fetch_array($result))
-      {
-        array_push($all_tag_ids, $row['tag_id']);
-
-        if (!isset($tags_of[ $row['image_id'] ])) {
-          $tags_of[ $row['image_id'] ] = array();
-        }
-
-        array_push(
-          $tags_of[ $row['image_id'] ],
-          $row['tag_id']
-          );
-      }
-
-      $all_tag_ids = array_unique($all_tag_ids);
-
-      $query = '
-SELECT id,
-       name
-  FROM '.TAGS_TABLE.'
-  WHERE id IN ('.implode(',', $all_tag_ids).')
-;';
-      $result = pwg_query($query);
-
-      while ($row = mysql_fetch_array($result))
-      {
-        $tag_name_of[ $row['id'] ] = $row['name'];
-      }
-  }
-
-  $query = '
-SELECT id,
-       path
-  FROM '.IMAGES_TABLE.'
-  WHERE id IN ('.implode(',', $image_ids).')
-;';
-  $result = pwg_query($query);
-
-  while ($row = mysql_fetch_array($result))
-  {
-    $xml_string.= "  <photo>\n";
-    $xml_string.= "    <id>".$row['id']."</id>\n";
-    $xml_string.= "    <path>".$row['path']."</path>\n";
-
-    foreach ($tags_of[ $row['id'] ] as $tag_id)
-    {
-      $xml_string.= "    <tag>".$tag_name_of[$tag_id]."</tag>\n";
-    }
-
-    $xml_string.= "  </photo>\n";
-  }
-
-  $xml_string.= '</export>';
-  fwrite($fp, $xml_string);
-  fclose($fp);
-}
-
-/**
  * Refer main Piwigo URLs (currently PHPWG_DOMAIN domain)
  *
  * @param void
diff --git a/admin/template/goto/element_set_global.tpl b/admin/template/goto/element_set_global.tpl
index fc5a92e70..3bdf5688c 100644
--- a/admin/template/goto/element_set_global.tpl
+++ b/admin/template/goto/element_set_global.tpl
@@ -174,9 +174,6 @@
       {else}
       <li><label><input type="radio" name="caddie_action" value="add_selected" /> {'Add selected elements to caddie'|@translate}</label></li>
       {/if}
-
-      <li><label><input type="radio" name="caddie_action" value="export" /> {'Export data'|@translate}</label></li>
-
     </ul>
 
     <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit_caddie" /></p>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 49f29e7b0..923634a6c 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -468,7 +468,6 @@ $lang['Elements_not_linked'] = 'Not linked elements';
 $lang['special_admin_menu'] = 'Specials';
 $lang['Duplicates'] = 'Files with same name in more than one physical category';
 
-$lang['Export data'] = 'Export data';
 $lang['Overall'] = 'Overall';
 $lang['Year'] = 'Year';
 $lang['Month'] = 'Month';
@@ -637,4 +636,4 @@ $lang['Edit ranks'] = 'Edit ranks';
 $lang['No element in this category'] = 'No element in this category';
 $lang['Images manual order was saved'] = 'Images manual order was saved';
 $lang['ranks'] = 'ranks';
-?>
-\ No newline at end of file
+?>
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index 16e37c3c4..8504b1c0b 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -468,7 +468,6 @@ $lang['Elements_not_linked'] = 'Elementos no atados';
 $lang['special_admin_menu'] = 'Clases de matemáticas superiores';
 $lang['Duplicates'] = 'Ficheros que llevan el mismo nombre en varias categorías físicas';
 
-$lang['Export data'] = 'Exportar los datos';
 $lang['Overall'] = 'Vista global';
 $lang['Year'] = 'Año';
 $lang['Month'] = 'Mes';
@@ -632,4 +631,4 @@ $lang['link_info_image'] = 'Modificar las informaciones';
 $lang['edit category informations'] = 'editar las informaciones de esta categoría';
 $lang['nothing'] = 'nada';
 /* TODO */ $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones';
-?>
-\ No newline at end of file
+?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index ddcf2b90d..45a0be568 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -468,7 +468,6 @@ $lang['Elements_not_linked'] = 'Eléments non liés';
 $lang['special_admin_menu'] = 'Spéciales';
 $lang['Duplicates'] = 'Fichiers portant le même nom dans plusieurs catégories physiques';
 
-$lang['Export data'] = 'Exporter les données';
 $lang['Overall'] = 'Vue globale';
 $lang['Year'] = 'Année';
 $lang['Month'] = 'Mois';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index 3e29181b5..dafc7c757 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -468,7 +468,6 @@ $lang['Elements_not_linked'] = 'Elementi sciolti';
 $lang['special_admin_menu'] = 'Speciale';
 $lang['Duplicates'] = 'File con stesso nome in più di una categoria fisica';
 
-$lang['Export data'] = 'Esportare i dati';
 $lang['Overall'] = 'Vista globale';
 $lang['Year'] = 'Anno';
 $lang['Month'] = 'Mese';
@@ -636,4 +635,4 @@ $lang['Edit ranks'] = 'Modificare gli ordini';
 $lang['No element in this category'] = 'Nessun\'elemento in questa categoria';
 $lang['Images manual order was saved'] = 'L\'ordinamento manuale delle immagini è stato salvato';
 $lang['ranks'] = 'rangs';
-?>
-\ No newline at end of file
+?>
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 0bb9a65ec..87ded7e5d 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -468,7 +468,6 @@ $lang['Elements_not_linked'] = 'Niet gelinkte elementen';
 $lang['special_admin_menu'] = 'Speciaal';
 $lang['Duplicates'] = 'Bestanden met de zelfde naam in meer dan één physieke categorie';
 
-$lang['Export data'] = 'Exporteer data';
 $lang['Overall'] = 'Totaal';
 $lang['Year'] = 'Jaar';
 $lang['Month'] = 'Maand';
@@ -632,4 +631,4 @@ $lang['link_info_image'] = 'Aanpassen informatie';
 $lang['edit category informations'] = 'bewerk categorie informatie';
 /* TODO */ $lang['nothing'] = 'nothing';
 /* TODO */ $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones';
-?>
-\ No newline at end of file
+?>