Changeset 9563

Timestamp:

Mar 7, 2011, 3:49:55 PM (13 years ago)

Author:

plg

Message:

bug fixed: do not display the upload link in the menubar if you can create top level albums or if there is no albums for upload

Location:

extensions/community

Files:

• add_photos.php (modified) (3 diffs)
• main.inc.php (modified) (1 diff)

extensions/community/add_photos.php

@@ -36 +36 @@
 $user_permissions = community_get_user_permissions($user['id']);
 
+if (count($user_permissions['upload_categories']) == 0 and !$user_permissions ['create_whole_gallery'])
+{
+  redirect(make_index_url());
+}
+
 // +-----------------------------------------------------------------------+
 // |                             process form                              |
@@ -246 +251 @@
 
 // we have to change the list of uploadable albums
+$upload_categories = $user_permissions['upload_categories'];
+if (count($upload_categories) == 0)
+{
+  $upload_categories = array(-1);
+}
+
 $query = '
 SELECT id,name,uppercats,global_rank
   FROM '.CATEGORIES_TABLE.'
-  WHERE id IN ('.implode(',', $user_permissions['upload_categories']).')
+  WHERE id IN ('.implode(',', $upload_categories).')
 ;';
 
@@ -259 +270 @@
 
 $create_subcategories = false;
+
+if ($user_permissions['create_whole_gallery'])
+{
+  $create_subcategories = true;
+}
 
 if (count($user_permissions['create_categories']) > 0)

extensions/community/main.inc.php

@@ -128 +128 @@
   $user_permissions = community_get_user_permissions($user['id']);
   
-  if (!$user_permissions['upload_whole_gallery'] and count($user_permissions['upload_categories']) == 0)
+  if (count($user_permissions['upload_categories']) == 0 and !$user_permissions ['create_whole_gallery'])
   {
     return;