Changeset 28087 for trunk/include/functions_search.inc.php

Timestamp:

Apr 5, 2014, 9:24:27 PM (10 years ago)

Author:

rvelices

Message:

bug 3069: add quick search as filter in batch manager

File:

• trunk/include/functions_search.inc.php (modified) (3 diffs)

trunk/include/functions_search.inc.php

@@ -1194 +1194 @@
  * @return array
  */
-function get_quick_search_results($q, $super_order_by, $images_where='')
+function get_quick_search_results($q, $options)
 {
   global $conf;
@@ -1255 +1255 @@
   }
 
+  $permissions = !isset($options['permissions']) ? true : $options['permissions'];
+
   $where_clauses = array();
   $where_clauses[]='i.id IN ('. implode(',', $ids) . ')';
-  if (!empty($images_where))
+  if (!empty($options['images_where'))
   {
     $where_clauses[]='('.$images_where.')';
   }
-  $where_clauses[] = get_sql_condition_FandF(
-      array
-        (
-          'forbidden_categories' => 'category_id',
-          'visible_categories' => 'category_id',
-          'visible_images' => 'i.id'
-        ),
-      null,true
-    );
+  if ($permissions)
+  {
+    $where_clauses[] = get_sql_condition_FandF(
+        array
+          (
+            'forbidden_categories' => 'category_id',
+            'visible_categories' => 'category_id',
+            'visible_images' => 'i.id'
+          ),
+        null,true
+      );
+  }
 
   $query = '
-SELECT DISTINCT(id)
-  FROM '.IMAGES_TABLE.' i
-    INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
+SELECT DISTINCT(id) FROM '.IMAGES_TABLE.' i';
+  if ($permissions)
+  {
+    $query .= '
+    INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id';
+  }
+  $query .= '
   WHERE '.implode("\n AND ", $where_clauses)."\n".
   $conf['order_by'];
@@ -1306 +1315 @@
   else
   {
-    return get_quick_search_results($search['q'], $super_order_by, $images_where);
+    return get_quick_search_results($search['q'], array('super_order_by'=>$super_order_by, 'images_where'=>$images_where) );
   }
 }