Changeset 23085 for extensions/community/admin_permissions.php

Timestamp:

Jun 7, 2013, 2:41:14 PM (11 years ago)

Author:

plg

Message:

New feature: user album. Only for registered users, no recursivity. Piwigo
will automatically create an upload album for each user with appropriate
community permissions, at first connection.

Bug fixed: on activation, do not create a new "Community" album if it already
exists.

Bug fixed: remove debug for quota

Bug fixed: round corners for number of pending pictures in admin menu.

File:

• extensions/community/admin_permissions.php (modified) (8 diffs)

extensions/community/admin_permissions.php

@@ -51 +51 @@
 if (isset($_POST['submit_add']))
 {
+  // echo '<pre>'; print_r($_POST); echo '</pre>';
   if (!in_array($_POST['who'], array_keys($who_options)))
   {
@@ -81 +82 @@
   {
     check_input_parameter('storage', $_POST, false, PATTERN_ID);
+  }
+
+  // it is already blocked by Javascript, but an extra check is usefull
+  if ('any_visitor' == $_POST['who'] and -1 == $_POST['category'])
+  {
+    die('hacking attempt: invalid "where" option for this user');
+  }
+
+  if (-1 == $_POST['category'])
+  {
+    unset($_POST['recursive']);
+    unset($_POST['create_subcategories']);
   }
 
@@ -89 +102 @@
     'user_id' => ('user' == $_POST['who']) ? $_POST['who_user'] : null,
     'category_id' => ($_POST['category'] > 0) ? $_POST['category'] : null,
+    'user_album' => boolean_to_string(-1 == $_POST['category']),
     'recursive' => isset($_POST['recursive']) ? 'true' : 'false',
     'create_subcategories' => isset($_POST['create_subcategories']) ? 'true' : 'false',
@@ -107 +121 @@
     AND group_id '.(isset($insert['group_id']) ? '= '.$insert['group_id'] : 'is null').'
     AND category_id '.(isset($insert['category_id']) ? '= '.$insert['category_id'] : 'is null').'
+    AND user_album = \''.$insert['user_album'].'\'
 ;';
   $result = pwg_query($query);
@@ -231 +246 @@
         'user_options_selected' => $row['user_id'],
         'group_options_selected' => $row['group_id'],
+        'whole_gallery_selected' => empty($row['category_id']) and !get_boolean($row['user_album']),
+        'user_album_selected' => get_boolean($row['user_album']),
         'recursive' => get_boolean($row['recursive']),
         'create_subcategories' => get_boolean($row['create_subcategories']),
@@ -244 +261 @@
   $template->assign(
     array(
+      'whole_gallery_selected' => !$conf['community']['user_albums'],
+      'user_album_selected' => $conf['community']['user_albums'],
       'moderated' => true,
       'nb_photos' => -1,
@@ -310 +329 @@
   array(
     'F_ADD_ACTION' => COMMUNITY_BASE_URL.'-'.$page['tab'],
+    'community_conf' => $conf['community'],
     )
   );
@@ -418 +438 @@
 foreach ($permissions as $permission)
 {
-  $where = l10n('The whole gallery');
-  if (isset($permission['category_id']))
-  {
-    $where = $name_of_category[ $permission['category_id'] ];
+  $where = l10n('User album only');
+  if (!get_boolean($permission['user_album']))
+  {
+    $where = l10n('The whole gallery');
+    if (isset($permission['category_id']))
+    {
+      $where = $name_of_category[ $permission['category_id'] ];
+    }
   }