feature 2091: Batch Manager, find all orphan photos

git-svn-id: http://piwigo.org/svn/trunk@8419 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 18 insertions, 1 deletions

diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index 89a1b8bc1..e11c8213e 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -177,6 +177,21 @@ SELECT id
       );
   }
 
+  if ('with no album' == $_SESSION['bulk_manager_filter']['prefilter'])
+  {
+    $query = '
+SELECT
+    id
+  FROM '.IMAGES_TABLE.'
+    LEFT JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id
+  WHERE category_id is null
+;';
+    array_push(
+      $filter_sets,
+      array_from_query($query, 'id')
+      );
+  }
+
   if ('duplicates' == $_SESSION['bulk_manager_filter']['prefilter'])
   {
     // we could use the group_concat MySQL function to retrieve the list of
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 1fb57289a..039caf78a 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -344,11 +344,11 @@ a.removeFilter:hover {background: url(admin/themes/default/icon/remove_filter_ho
         <select name="filter_prefilter">
           <option value="caddie" {if $filter.prefilter eq 'caddie'}selected="selected"{/if}>{'caddie'|@translate}</option>
           <option value="last import" {if $filter.prefilter eq 'last import'}selected="selected"{/if}>{'last import'|@translate}</option>
+          <option value="with no album" {if $filter.prefilter eq 'with no album'}selected="selected"{/if}>{'with no album'|@translate}</option> -->
 {if $ENABLE_SYNCHRONIZATION}
           <option value="with no virtual album" {if $filter.prefilter eq 'with no virtual album'}selected="selected"{/if}>{'with no virtual album'|@translate}</option>
 {/if}
           <option value="duplicates" {if $filter.prefilter eq 'duplicates'}selected="selected"{/if}>{'duplicates'|@translate}</option>
-<!--          <option value="with no album">with no album</option> -->
 <!--          <option value="with no tag">with no tag</option> -->
         </select>
       </li>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 3d4586f17..1adef4441 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -797,4 +797,5 @@ $lang['Type here the author name'] = 'Type here the author name';
 $lang['remove title'] = 'remove title';
 $lang['Type here the title'] = 'Type here the title';
 $lang['remove creation date'] = 'remove creation date';
+$lang['with no album'] = 'with no album';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index d1d474e2d..4356cee5b 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -802,4 +802,5 @@ $lang['Type here the author name'] = 'Entrez ici le nom de l\'auteur';
 $lang['remove title'] = 'supprimer le titre';
 $lang['Type here the title'] = 'Entrez ici le titre';
 $lang['remove creation date'] = 'supprimer la date de création';
+$lang['with no album'] = 'sans album';
 ?>