Changeset 4883 for branches/2.0/include/ws_functions.inc.php

Timestamp:

Feb 13, 2010, 12:04:07 AM (15 years ago)

Author:

plg

Message:

bug 1431: Community users now can see empty categories just like any admin.

File:

• branches/2.0/include/ws_functions.inc.php (modified) (3 diffs)

branches/2.0/include/ws_functions.inc.php

@@ -366 +366 @@
   global $user,$conf;
 
-  $where = array();
+  $where = array('1=1');
+  $join_type = 'INNER';
+  $join_user = $user['id'];
 
   if (!$params['recursive'])
@@ -387 +389 @@
     $where[] = 'status = "public"';
     $where[] = 'visible = "true"';
-    $where[]= 'user_id='.$conf['guest_id'];
-  }
-  else
-  {
-    $where[]= 'user_id='.$user['id'];
+    
+    $join_user = $conf['guest_id'];
+  }
+  elseif (is_admin())
+  {
+    // in this very specific case, we don't want to hide empty
+    // categories. Function calculate_permissions will only return
+    // categories that are either locked or private and not permitted
+    // 
+    // calculate_permissions does not consider empty categories as forbidden
+    $forbidden_categories = calculate_permissions($user['id'], $user['status']);
+    $where[]= 'id NOT IN ('.$forbidden_categories.')';
+    $join_type = 'LEFT';
   }
 
@@ -399 +409 @@
     date_last, max_date_last, count_categories AS nb_categories
   FROM '.CATEGORIES_TABLE.'
-   INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON id=cat_id
+   '.$join_type.' JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON id=cat_id AND user_id='.$join_user.'
   WHERE '. implode('
     AND ', $where);