Changeset 6213

Timestamp:

May 17, 2010, 10:10:09 PM (14 years ago)

Author:

grum

Message:

results for request builder if filtered with user rights access

Location:

extensions/GrumPluginClasses

Files:

• classes/GPCRequestBuilder.class.inc.php (modified) (6 diffs)
• language/en_UK/rbuilder.lang.php (added)

extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php

@@ -164 +164 @@
    * @return Boolean : true if registering is Ok, otherwise false
    */
-  static public function register($pluginName, $fileName, $dialogBoxObject)
+  static public function register($pluginName, $fileName)
   {
     $config=Array();
@@ -172 +172 @@
         'name' => $pluginName,
         'fileName' => $fileName,
-        'dialogBox' => $dialogBoxObject,
         'date' => date("Y-m-d H:i:s"),
         'version' => self::$version,
@@ -400 +399 @@
     $tmpBuild=Array(
       'FROM' => Array(
-        '('.IMAGES_TABLE.' pit LEFT JOIN '.IMAGE_CATEGORY_TABLE.' pic ON pit.id = pic.image_id)', //JOIN IMAGES & IMAGE_CATEGORY tables
+        '('.IMAGES_TABLE.' pit LEFT JOIN '.IMAGE_CATEGORY_TABLE.' pic ON pit.id = pic.image_id)' /*JOIN IMAGES & IMAGE_CATEGORY tables*/
+       .'   JOIN '.USER_CACHE_CATEGORIES_TABLE.' pucc ON pucc.cat_id=pic.category_id',  /* IMAGE_CATEGORY & USER_CACHE_CATEGORIES_TABLE tables*/
+
       ),
       'WHERE' => Array(),
-      'JOIN' => Array(),
+      'JOIN' => Array(999=>'pucc.user_id='.$user['id']),
       'GROUPBY' => Array(
         'pit.id'
@@ -464 +465 @@
     unset($tmpBuild['FROM']);
 
-
     /* build WHERE
      */
@@ -532 +532 @@
   static private function getPage($requestNumber, $pageNumber, $numPerPage)
   {
-    global $conf;
+    global $conf, $user;
     $request=self::getRequest($requestNumber);
 
@@ -561 +561 @@
       'FROM' => Array(
         // join rb result_cache table with piwigo's images table, joined with the piwigo's image_category table, joined with the categories table
-        'RB' => "((".self::$tables['result_cache']." pgrc
+        'RB' => "(((".self::$tables['result_cache']." pgrc
                   RIGHT JOIN ".IMAGES_TABLE." pit
                   ON pgrc.image_id = pit.id)
                     RIGHT JOIN ".IMAGE_CATEGORY_TABLE." pic
                     ON pit.id = pic.image_id)
-                       RIGHT JOIN piwigo_categories pct
-                       ON pct.id = pic.category_id ",
+                       RIGHT JOIN ".CATEGORIES_TABLE." pct
+                       ON pct.id = pic.category_id)
+                          RIGHT JOIN ".USER_CACHE_CATEGORIES_TABLE." pucc
+                          ON pucc.cat_id = pic.category_id",
       ),
       'WHERE' => Array(
-        'RB' => "pgrc.id=".$requestNumber,
+        'RB' => "pgrc.id=".$requestNumber." AND pucc.user_id=".$user['id'],
         ),
       'JOIN' => Array(),