Changeset 9500 for extensions/community/add_photos.php

Timestamp:

Mar 3, 2011, 10:12:57 PM (13 years ago)

Author:

plg

Message:

a permission may not automatically apply to sub-albums

in the upload form, the album list does not show private (and unreachable for
the user) albums and public albums that contains photos invisible to the user.

File:

• extensions/community/add_photos.php (modified) (5 diffs)

extensions/community/add_photos.php

@@ -51 +51 @@
   {
     // is the user authorized to upload in this album?
-    if (!$user_permissions['upload_whole_gallery'])
-    {
-      if (!in_array($_POST['category'], $user_permissions['upload_categories']))
-      {
-        echo 'Hacking attempt, you have no permission to upload in this album';
-        $hacking_attempt = true;
-      }
+    if (!in_array($_POST['category'], $user_permissions['upload_categories']))
+    {
+      echo 'Hacking attempt, you have no permission to upload in this album';
+      $hacking_attempt = true;
     }
   }
   elseif ('new' == $_POST['category_type'])
   {
-    if (!$user_permissions['create_whole_gallery'])
-    {
-      if (!in_array($_POST['category_parent'], $user_permissions['create_categories']))
-      {
-        echo 'Hacking attempt, you have no permission to create this album';
-        $hacking_attempt = true;
-      }
+    if (!in_array($_POST['category_parent'], $user_permissions['create_categories']))
+    {
+      echo 'Hacking attempt, you have no permission to create this album';
+      $hacking_attempt = true;
     }
   }
@@ -291 +285 @@
 include_once(PHPWG_ROOT_PATH.'admin/include/photos_add_direct_prepare.inc.php');
 
-if (!$user_permissions['upload_whole_gallery'])
-{
-  // we have to change the list of uploadable albums
-  $query = '
+// we have to change the list of uploadable albums
+$query = '
 SELECT id,name,uppercats,global_rank
   FROM '.CATEGORIES_TABLE.'
@@ -300 +292 @@
 ;';
 
-  display_select_cat_wrapper(
-    $query,
-    $selected_category,
-    'category_options'
-    );
-}
+display_select_cat_wrapper(
+  $query,
+  $selected_category,
+  'category_options'
+  );
 
 $create_subcategories = false;
 
-if ($user_permissions['create_whole_gallery'] or count($user_permissions['create_categories']) > 0)
+if (count($user_permissions['create_categories']) > 0)
 {
   $create_subcategories = true;
@@ -316 +307 @@
   $query = '
 SELECT id,name,uppercats,global_rank
-  FROM '.CATEGORIES_TABLE;
-  
-  if (!$user_permissions['create_whole_gallery'])
-  {
-    $query.= '
-  WHERE id IN ('.implode(',', $user_permissions['create_categories']).')';
-  }
-
-  $query.= '
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id IN ('.implode(',', $user_permissions['create_categories']).')
 ;';
 
@@ -358 +342 @@
 $title = l10n('Upload Photos');
 $page['body_id'] = 'theUploadPage';
-// include(PHPWG_ROOT_PATH.'include/page_header.php');
-// $template->pparse('add_photos');
-// include(PHPWG_ROOT_PATH.'include/page_tail.php');
 
 $template->assign_var_from_handle('PLUGIN_INDEX_CONTENT_BEGIN', 'add_photos');