diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 0842e761e..cbeb0ebe9 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -99,14 +99,29 @@ if (isset($_POST['submitFilter'])) if ('duplicates' == $_POST['filter_prefilter']) { + $has_options = false; + + if (isset($_POST['filter_duplicates_checksum'])) + { + $_SESSION['bulk_manager_filter']['duplicates_checksum'] = true; + $has_options = true; + } + if (isset($_POST['filter_duplicates_date'])) { $_SESSION['bulk_manager_filter']['duplicates_date'] = true; + $has_options = true; } if (isset($_POST['filter_duplicates_dimensions'])) { $_SESSION['bulk_manager_filter']['duplicates_dimensions'] = true; + $has_options = true; + } + + if (!$has_options or isset($_POST['filter_duplicates_filename'])) + { + $_SESSION['bulk_manager_filter']['duplicates_filename'] = true; } } } @@ -357,7 +372,17 @@ SELECT case 'duplicates': - $duplicates_on_fields = array('file'); + $duplicates_on_fields = array(); + + if (isset($_SESSION['bulk_manager_filter']['duplicates_filename'])) + { + $duplicates_on_fields[] = 'file'; + } + + if (isset($_SESSION['bulk_manager_filter']['duplicates_checksum'])) + { + $duplicates_on_fields[] = 'md5sum'; + } if (isset($_SESSION['bulk_manager_filter']['duplicates_date'])) { diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index 5ff1b96da..966f0ef25 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -349,7 +349,8 @@ var sliders = { {'based on'|translate} - diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index a9ea33db5..5b1ec0c1e 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -998,4 +998,5 @@ $lang['Delete album "%s" and its %d sub-albums.'] = 'Delete album "%s" and its % $lang['delete album and all %d photos, even the %d associated to other albums'] = 'delete album and all %d photos, even the %d associated to other albums'; $lang['delete album and the %d orphan photos'] = 'delete album and the %d orphan photos'; $lang['delete only album, not photos'] = 'delete only album, not photos'; -$lang['Confirm deletion'] = 'Confirm deletion'; \ No newline at end of file +$lang['Confirm deletion'] = 'Confirm deletion'; +$lang['checksum'] = 'checksum'; \ No newline at end of file diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index b3a7548c9..2be93f433 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1000,4 +1000,5 @@ $lang['Delete album "%s" and its %d sub-albums.'] = 'Supprimer l\'album "%s" et $lang['delete album and all %d photos, even the %d associated to other albums'] = 'supprimer l\'album et toutes les %d photos, mêmes les %d associées à d\'autres albums'; $lang['delete album and the %d orphan photos'] = 'supprimer l\'album et les %d photos orphelines'; $lang['delete only album, not photos'] = 'supprimer uniquement l\'album, pas les photos'; -$lang['Confirm deletion'] = 'Confirmer la suppression'; \ No newline at end of file +$lang['Confirm deletion'] = 'Confirmer la suppression'; +$lang['checksum'] = 'somme de contrôle'; \ No newline at end of file