Changeset 9444 for extensions

Timestamp:

Mar 1, 2011, 11:09:35 AM (14 years ago)

Author:

plg

Message:

bug fixed: use the same function to check permissions on menubar and on upload
form (groups where not fixed for menubar)

bug fixed: if no permission defined, the upload_categories was empty and SQL
query was crashing Piwigo

admins get automatically full permissions

Location:

extensions/community

Files:

• include/functions_community.inc.php (modified) (3 diffs)
• main.inc.php (modified) (2 diffs)

extensions/community/include/functions_community.inc.php

@@ -26 +26 @@
   global $conf;
 
+  if (is_admin())
+  {
+    return array(
+      'upload_whole_gallery' => true,
+      'create_whole_gallery' => true,
+      'create_categories' => array(),
+      'upload_categories' => array(),
+      'permission_ids' => array(),
+      );
+  }
+
   $return = array(
     'upload_whole_gallery' => false,
@@ -33 +44 @@
     'permission_ids' => array(),
     );
-
-  $user_permissions = array();
   
   // what are the user groups?
@@ -96 +105 @@
   }
 
-  if (!$return['upload_whole_gallery'])
+  if (!$return['upload_whole_gallery'] and count($return['upload_categories']) > 0)
   {
     $return['upload_categories'] = get_subcat_ids($return['upload_categories']);

extensions/community/main.inc.php

@@ -20 +20 @@
 define('COMMUNITY_PERMISSIONS_TABLE', $prefixeTable.'community_permissions');
 define('COMMUNITY_PENDINGS_TABLE', $prefixeTable.'community_pendings');
+
+include_once(COMMUNITY_PATH.'include/functions_community.inc.php');
 
 /* Plugin admin */
@@ -66 +68 @@
   // conditional : depending on community permissions, display the "Add
   // photos" link in the gallery menu
+  $user_permissions = community_get_user_permissions($user['id']);
   
-  // admins are not concerned about community permissions
-  if (!is_admin())
+  if (!$user_permissions['upload_whole_gallery'] and count($user_permissions['upload_categories']) == 0)
   {
-    // what are the user groups?
-    $query = '
-SELECT
-    group_id
-  FROM '.USER_GROUP_TABLE.'
-  WHERE user_id = '.$user['id'].'
-;';
-    $user_group_ids = array_from_query($query, 'group_id');
-
-    $query = '
-SELECT
-    COUNT(*)
-  FROM '.COMMUNITY_PERMISSIONS_TABLE.'
-  WHERE (type = \'any_visitor\')';
-
-    if ($user['id'] != $conf['guest_id'])
-    {
-      $query.= '
-    OR (type = \'any_registered_user\')
-    OR (type = \'user\' AND user_id = '.$user['id'].')
-    OR (type = \'group\' AND group_id IN ('.implode(',', $user_group_ids).'))
-';
-    }
-    
-    $query.= '
-;';
-
-    list($counter) = pwg_db_fetch_row(pwg_query($query));
-    if (0 == $counter)
-    {
-      return;
-    }
+    return;
   }