Changeset 7310 for extensions/GrumPluginClasses/classes/GPCCategorySelector.class.inc.php

Timestamp:

Oct 20, 2010, 11:04:22 PM (14 years ago)

Author:

grum

Message:

fix bug on the rbuilder and migrate ajax call on the gpc ajax manager
fix bug:1945
add some functionnalities

File:

• extensions/GrumPluginClasses/classes/GPCCategorySelector.class.inc.php (modified) (4 diffs)

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

@@ -3 +3 @@
  * -----------------------------------------------------------------------------
  * class name     : GPCCategorySelector
- * class version  : 1.0.0
- * plugin version : 3.3.0
- * date           : 2010-10-09
+ * class version  : 1.0.1
+ * plugin version : 3.3.3
+ * date           : 2010-10-20
  * -----------------------------------------------------------------------------
  * author: grum at piwigo.org
@@ -14 +14 @@
  *
 | release | date       |
-| 1.0.0   | 2010/04/18 | * create class
-|         |            |
-|         |            |
+| 1.0.0   | 2010/10/09 | * create class
+|         |            |
+| 1.0.1   | 2010/10/20 | * fix bug on the private select methods
 |         |            |
 |         |            |
@@ -242 +242 @@
 
     $sql="SELECT DISTINCT pct.id, pct.name, pct.global_rank AS rank, pct.status
-          FROM (".CATEGORIES_TABLE." pct ";
-
-    if($this->options['userMode']==self::USER_MODE_PUBLIC)
-    {
-      $sql.=" JOIN ".USER_CACHE_CATEGORIES_TABLE." pucc
-                ON (pucc.cat_id = pct.id) AND pucc.user_id='".$user['id']."') ";
-    }
-    else
-    {
-      $sql.=") ";
-    }
+          FROM ".CATEGORIES_TABLE." pct ";
 
     switch($this->options['filter'])
@@ -260 +250 @@
         break;
       case self::FILTER_ACCESSIBLE :
-        $sql.=" JOIN (
-                  SELECT DISTINCT pgat.cat_id AS catId FROM ".GROUP_ACCESS_TABLE." pgat
-                  UNION DISTINCT
-                  SELECT DISTINCT puat.cat_id AS catId FROM ".USER_ACCESS_TABLE." puat
-                     ) pat
-                ON (pat.catId = pct.id AND pct.status = 'private') OR (pct.status = 'public') ";
+        if(!is_admin())
+        {
+          $sql.=" JOIN ".USER_CACHE_CATEGORIES_TABLE." pucc
+                  ON (pucc.cat_id = pct.id) AND pucc.user_id='".$user['id']."' ";
+        }
+        else
+        {
+          $sql.=" JOIN (
+                    SELECT DISTINCT pgat.cat_id AS catId FROM ".GROUP_ACCESS_TABLE." pgat
+                    UNION DISTINCT
+                    SELECT DISTINCT puat.cat_id AS catId FROM ".USER_ACCESS_TABLE." puat
+                    UNION DISTINCT
+                    SELECT DISTINCT pct2.id AS catId FROM ".CATEGORIES_TABLE." pct2 WHERE pct2.status='public'
+                       ) pat
+                  ON pat.catId = pct.id ";
+        }
+
         break;
     }