Changeset 9583

Timestamp:

Mar 9, 2011, 2:06:10 PM (13 years ago)

Author:

plg

Message:

bug fixed: invalidate_user_cache now also invalidates community user
permissions cache

bug fixed: community permissions cache was not refreshed when user connects,
I have added $_SESSIONcommunity_user_id to make sure the permissions are
related to the correct user

change: use a random key for cache update to avoid "in the same second
refresh".

filter the list of parent albums for "create a new album" based on permissions
even when create_whole_gallery is true

Location:

extensions/community

Files:

• add_photos.php (modified) (1 diff)
• admin_permissions.php (modified) (2 diffs)
• include/functions_community.inc.php (modified) (3 diffs)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (1 diff)

extensions/community/add_photos.php

@@ -270 +270 @@
 
 $create_subcategories = false;
-
-if ($user_permissions['create_whole_gallery'])
+if ($user_permissions['create_whole_gallery'] or count($user_permissions['create_categories']) > 0)
 {
   $create_subcategories = true;
 }
 
-if (count($user_permissions['create_categories']) > 0)
-{
-  $create_subcategories = true;
-  $category_ids = null;
-  
-  $query = '
+$create_categories = $user_permissions['create_categories'];
+if (count($user_permissions['create_categories']) == 0)
+{
+  $create_categories = array(-1);
+}
+
+$query = '
 SELECT id,name,uppercats,global_rank
   FROM '.CATEGORIES_TABLE.'
-  WHERE id IN ('.implode(',', $user_permissions['create_categories']).')
-;';
-
-  display_select_cat_wrapper(
-    $query,
-    $selected_category,
-    'category_parent_options'
-    );
-}
+  WHERE id IN ('.implode(',', $create_categories).')
+;';
+
+display_select_cat_wrapper(
+  $query,
+  $selected_category,
+  'category_parent_options'
+  );
 
 $template->assign(

extensions/community/admin_permissions.php

@@ -157 +157 @@
   }
 
-  conf_update_param('community_update', time());
+  community_update_cache_key();
 }
 
@@ -175 +175 @@
   pwg_query($query);
 
-  conf_update_param('community_update', time());
+  community_update_cache_key();
 
   $_SESSION['page_infos'] = array(l10n('Permission removed'));

extensions/community/include/functions_community.inc.php

@@ -26 +26 @@
   global $conf, $user;
 
-  if (!isset($conf['community_update']))
-  {
-    conf_update_param('community_update', time());
-  }
-  
-  if (isset($_SESSION['community_user_permissions']))
-  {
-    if ($_SESSION['community_update'] > $conf['community_update'])
-    {
-      return $_SESSION['community_user_permissions'];
-    }
+  $cache_key = community_get_cache_key();
+  if (!isset($cache_key))
+  {
+    $cache_key = community_update_cache_key();
+  }
+
+  // I (plg) don't understand why, but when you connect, you keep the
+  // permissions calculated for the "guest" : the session is "inheritated"
+  // from guest to the connected user, so I add a
+  // $_SESSION['community_user_id'] to force refresh if the permissions were
+  // not calculated for the right user
+  if (
+    isset($_SESSION['community_user_id'])
+    and $_SESSION['community_user_id'] == $user_id
+    and $_SESSION['community_cache_key'] == $cache_key
+    )
+  {
+    return $_SESSION['community_user_permissions'];
   }
 
@@ -199 +206 @@
 
   $_SESSION['community_user_permissions'] = $return;
-  $_SESSION['community_update'] = time();
+  $_SESSION['community_cache_key'] = $cache_key;
+  $_SESSION['community_user_id'] = $user_id;
 
   return $_SESSION['community_user_permissions'];
@@ -242 +250 @@
 }
 
+function community_update_cache_key()
+{
+  $cache_key = generate_key(20);
+  conf_update_param('community_cache_key', $cache_key);
+  return $cache_key;
+}
+
+function community_get_cache_key()
+{
+  global $conf;
+
+  if (isset($conf['community_cache_key']))
+  {
+    return $conf['community_cache_key'];
+  }
+  else
+  {
+    return null;
+  }
+}
 ?>

extensions/community/main.inc.php

@@ -127 +127 @@
   // photos" link in the gallery menu
   $user_permissions = community_get_user_permissions($user['id']);
-  
+
   if (count($user_permissions['upload_categories']) == 0 and !$user_permissions ['create_whole_gallery'])
   {
@@ -213 +213 @@
   community_reject_user_pendings($user_id);
 }
+
+add_event_handler('invalidate_user_cache', 'community_refresh_cache_update_time');
+function community_refresh_cache_update_time()
+{
+  community_update_cache_key();
+}
 ?>

extensions/community/maintain.inc.php

@@ -328 +328 @@
   mass_inserts($prefixeTable.'community_permissions', array_keys($insert), array($insert));
 
-  conf_update_param('community_update', time());
+  include_once(dirname(__FILE__).'/include/functions_community.inc.php');
+  community_update_cache_key();
 }
 ?>