Changeset 1688

Timestamp:

Jan 2, 2007, 10:02:39 AM (17 years ago)

Author:

vdigital

Message:

Physical duplicate files in Admin Advanced Functions

Location:

trunk

Files:

• admin/advanced_feature.php (modified) (1 diff)
• admin/element_set.php (modified) (2 diffs)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/en_UK.iso-8859-1/help/advanced_feature.html (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/help/advanced_feature.html (modified) (1 diff)
• template/yoga/admin/advanced_feature.tpl (modified) (1 diff)

trunk/admin/advanced_feature.php

@@ -66 +66 @@
 //    'U_ADV_????' => $start_url.'???',
     'U_ADV_ELEMENT_NOT_LINKED' => PHPWG_ROOT_PATH.'admin.php?page=element_set&cat=not_linked',
+    'U_ADV_DUP_FILES' => PHPWG_ROOT_PATH.'admin.php?page=element_set&cat=duplicates',
     'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=advanced_feature'
     )

trunk/admin/element_set.php

@@ -138 +138 @@
 else if ('not_linked' == $_GET['cat'])
 {
-  $page['title'] = 'elements not linked to any virtual categories';
+  $page['title'] = l10n('Elements_not_linked');
   
   // we are searching elements not linked to any virtual category
@@ -163 +163 @@
   $page['cat_elements_id'] = array_diff($all_elements, $linked_to_virtual);
 }
-
+else if ('duplicates' == $_GET['cat'])
+{
+  $page['title'] = l10n('Duplicates');
+  
+  // we are searching related elements twice or more to physical categories
+  // 1 - Retrieve Files
+  $query = '
+SELECT DISTINCT(file)
+  FROM '.IMAGES_TABLE.' 
+ GROUP BY file 
+HAVING COUNT(DISTINCT storage_category_id) > 1 
+;';  
+
+  $duplicate_files = array_from_query($query, 'file');
+  $duplicate_files[]='Nofiles';
+  // 2 - Retrives related picture ids
+  $query = '
+SELECT id, file
+  FROM '.IMAGES_TABLE.' 
+WHERE file IN (\''.implode("','", $duplicate_files).'\')
+ORDER BY file, id
+;';
+
+  $page['cat_elements_id'] = array_from_query($query, 'id');
+  $page['cat_elements_id'][] = 0;
+}
 // +-----------------------------------------------------------------------+
 // |                       first element to display                        |

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -572 +572 @@
 $lang['note_check_more_info_forum'] = 'the forum';
 $lang['note_check_more_info_wiki'] = 'the wiki';
-
+$lang['Duplicates'] = 'Files with same name in more than one physical category';
 
 ?>

trunk/language/en_UK.iso-8859-1/help/advanced_feature.html

@@ -7 +7 @@
   <li>
     <strong>Not linked elements:</strong>
-    Display images witch are not associaed with an virtual catgory
+    Display images which are not associated to any virtual category.
+  </li>
+  <li>
+    <strong>Files with same name in more than one physical category:</strong>
+    Display images or any files which are found with the same filename in some categories.
   </li>
 

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -570 +570 @@
 $lang['note_check_more_info_forum'] = 'le forum';
 $lang['note_check_more_info_wiki'] = 'le wiki';
+$lang['Duplicates'] = 'Fichiers portant le même nom dans plusieurs' .
+    ' catégories physiques';
 
 ?>

trunk/language/fr_FR.iso-8859-1/help/advanced_feature.html

@@ -6 +6 @@
 
   <li>
-    <strong>Eléments non liés:</strong>
+    <strong>Eléments non liés :</strong>
     Affiche les images qui ne sont pas associées à une catégorie virtuelle
+  </li>
+  <li>
+    <strong>Fichiers portant le même nom dans plusieurs catégories physiques :</strong>
+    Affiche les images ou les éventuels fichiers qui pourraient être trouvés dans plusieurs catégories.
   </li>
 

trunk/template/yoga/admin/advanced_feature.tpl

@@ -10 +10 @@
 <!--  <li><a href="{U_ADV_????}" {TAG_INPUT_ENABLED}>{lang:update categories informations}</a></li>-->
   <li><a href="{U_ADV_ELEMENT_NOT_LINKED}" {TAG_INPUT_ENABLED}>{lang:Elements_not_linked}</a></li>
+  <li><a href="{U_ADV_DUP_FILES}" {TAG_INPUT_ENABLED}>{lang:Duplicates}</a></li>
 </ul>