From f83e780249d55dd3d463cd0f21faf92b4215a508 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Fri, 12 Sep 2014 11:35:32 +0000 Subject: add URL filter input for dimension and filesize + batch_manager_url_filter trigger + fixes in doubleSlider.js git-svn-id: http://piwigo.org/svn/trunk@29505 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/batch_manager.php | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) (limited to 'admin/batch_manager.php') diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 65f8e69af..05590e29c 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -175,7 +175,7 @@ elseif (isset($_GET['filter'])) foreach ($_GET['filter'] as $filter) { - list($type, $value) = explode('-', $filter); + list($type, $value) = explode('-', $filter, 2); switch ($type) { @@ -183,7 +183,7 @@ elseif (isset($_GET['filter'])) $_SESSION['bulk_manager_filter']['prefilter'] = $value; break; - case 'album': + case 'album': case 'category': case 'cat': if (is_numeric($value)) { $_SESSION['bulk_manager_filter']['category'] = $value; @@ -204,10 +204,38 @@ elseif (isset($_GET['filter'])) $_SESSION['bulk_manager_filter']['level'] = $value; } break; - + case 'search': $_SESSION['bulk_manager_filter']['search']['q'] = $value; break; + + case 'dimension': + $dim_map = array('w'=>'width','h'=>'height','r'=>'ratio'); + foreach (explode('-', $value) as $part) + { + $values = explode('..', substr($part, 1)); + if (isset($dim_map[$part[0]])) + { + $type = $dim_map[$part[0]]; + list( + $_SESSION['bulk_manager_filter']['dimension']['min_'.$type], + $_SESSION['bulk_manager_filter']['dimension']['max_'.$type] + ) = $values; + } + } + break; + + case 'filesize': + list( + $_SESSION['bulk_manager_filter']['filesize']['min'], + $_SESSION['bulk_manager_filter']['filesize']['max'] + ) = explode('..', $value); + break; + + default: + $_SESSION['bulk_manager_filter'] = trigger_change('batch_manager_url_filter', + $_SESSION['bulk_manager_filter'], $type, $value); + break; } } } -- cgit v1.2.3