adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-08 01:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug 2506 fixed: Batch Manager does not take permissions into account when

Browse Source 
filtering on tags

feature 2507 added: Batch Manager can filter on "all tags" or "any tag"


git-svn-id: http://piwigo.org/svn/branches/2.3@12629 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-11-15 11:48:37 +00:00
parent 836df22920
commit bc16508161
3 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_tag.inc.php
+23 -14
View File
@@ -166,7 +166,7 @@ function add_level_to_tags($tags)
* @param string order_by - optionally overwrite default photo order
* @return array
*/
function get_image_ids_for_tags($tag_ids, $mode='AND', $extra_images_where_sql='', $order_by='')
function get_image_ids_for_tags($tag_ids, $mode='AND', $extra_images_where_sql='', $order_by='', $use_permissions=true)
{
global $conf;
if (empty($tag_ids))
@@ -175,22 +175,31 @@ function get_image_ids_for_tags($tag_ids, $mode='AND', $extra_images_where_sql='
}
$query = 'SELECT id
FROM '.IMAGES_TABLE.' i
INNER JOIN '.IMAGE_CATEGORY_TABLE.' ic ON id=ic.image_id
FROM '.IMAGES_TABLE.' i ';
if ($use_permissions)
{
$query.= '
INNER JOIN '.IMAGE_CATEGORY_TABLE.' ic ON id=ic.image_id';
}
$query.= '
INNER JOIN '.IMAGE_TAG_TABLE.' it ON id=it.image_id
WHERE tag_id IN ('.implode(',', $tag_ids).')'
.get_sql_condition_FandF
(
array
(
'forbidden_categories' => 'category_id',
'visible_categories' => 'category_id',
'visible_images' => 'id'
WHERE tag_id IN ('.implode(',', $tag_ids).')';
if ($use_permissions)
{
$query.= get_sql_condition_FandF(
array(
'forbidden_categories' => 'category_id',
'visible_categories' => 'category_id',
'visible_images' => 'id'
),
"\n AND"
)
.(empty($extra_images_where_sql) ? '' : " \nAND (".$extra_images_where_sql.')')
.'
);
}
$query.= (empty($extra_images_where_sql) ? '' : " \nAND (".$extra_images_where_sql.')').'
GROUP BY id';
if ($mode=='AND' and count($tag_ids)>1)