? 289752.patch
? 294656.patch
? 294656.patch.1
? hide_admin_links.patch
? smartqueue_users_perms.patch
Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/smartqueue_users/README.txt,v
retrieving revision 1.1
diff -u -p -r1.1 README.txt
--- README.txt	4 Jul 2008 21:40:12 -0000	1.1
+++ README.txt	15 Aug 2008 14:48:40 -0000
@@ -1,3 +1,5 @@
 http://drupal.org/project/smartqueue_users
 
-The Smartqueue per-User (smartqueue_users) module makes it easy to automatically provide a Node Queue for each user of one or more specified roles. This module is being developed for the 2008 Google Summer of Code by Ezra Barnett Gildesgame.
\ No newline at end of file
+The Smartqueue per-User (smartqueue_users) module makes it easy to automatically provide a Node Queue for each user of one or more specified roles. This module is being developed for the 2008 Google Summer of Code by Ezra Barnett Gildesgame.
+
+Note: If you wish to restrict access to viewing user node queues, you must do so in the smartqueue_users_user View *as well as* by restricting the 'view on user node queue' and 'view all user node queues' permissions. 
\ No newline at end of file
Index: smartqueue_users.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/smartqueue_users/smartqueue_users.module,v
retrieving revision 1.14.2.13
diff -u -p -r1.14.2.13 smartqueue_users.module
--- smartqueue_users.module	14 Aug 2008 20:29:19 -0000	1.14.2.13
+++ smartqueue_users.module	15 Aug 2008 14:48:41 -0000
@@ -136,8 +136,8 @@ function smartqueue_users_subqueue_acces
     $account = $user;
   }
 
-  $access_all = (user_access("manipulate all queues", $account) || user_access('manipulate all user node queues', $account));
-  $access_own = user_access('manipulate own user node queue', $account);
+  $access_all = (user_access("manipulate all queues", $account) || user_access('manipulate all user queues', $account));
+  $access_own = user_access('manipulate own user queue', $account);
 
   if (!($access_all || ($access_own && $account->uid == $subqueue->reference))) {
     return FALSE;
@@ -149,8 +149,8 @@ function smartqueue_users_queue_access($
     $account = $user;
   }
   
-  $access_all = (user_access("manipulate all queues", $account) || user_access('manipulate all user node queues', $account));
-  $access_own = user_access('manipulate own user node queue', $account);
+  $access_all = (user_access("manipulate all queues", $account) || user_access('manipulate all user queues', $account));
+  $access_own = user_access('manipulate own user queue', $account);
 
   if ($access_all || $access_own) {
     return TRUE;
@@ -164,14 +164,14 @@ function smartqueue_users_nodequeue_subq
   $references = array();
   global $user;
   $restrict_by_author = variable_get('smartqueue_users_sq_'. $queue->qid .'_restrict_author', 0);
-  $access_own = user_access('manipulate own user node queue');
+  $access_own = user_access('manipulate own user queue');
   
   /*
-  if (user_access("manipulate all queues" || user_access('manipulate all user node queues'))) {
+  if (user_access("manipulate all queues" || user_access('manipulate all user queues'))) {
     $access_all = TRUE;
   }
   */
-  $access_all = (user_access("manipulate all queues") || user_access('manipulate all user node queues'));
+  $access_all = (user_access("manipulate all queues") || user_access('manipulate all user queues'));
   if ($restrict_by_author == 1) {
     //all queues
     //all user queues
@@ -215,7 +215,7 @@ function smartqueue_users_menu($may_cach
     $items[] = array(
       'path' => 'admin/content/nodequeue/smartqueue_users/batch_delete',
       'title' => t('Confirm Smartqueue Users Batch Queue Deletion'),
-      'access' => user_access('manipulate all queues' || user_access('manipulate all user node queues')),
+      'access' => user_access('manipulate all queues' || user_access('manipulate all user queues')),
       'callback' => 'drupal_get_form',
       'callback arguments' => array('smartqueue_users_batch_delete_subqueues_confirm'),
       'type' => MENU_CALLBACK,
@@ -264,12 +264,12 @@ function smartqueue_users_user($op, &$ed
     case 'view':
       unset($access);
       $qid = smartqueue_users_get_qid();
-      $access = ((user_access('view own user node queue on user profile page') && $account->uid == $user->uid) || user_access('view all user node queues on profile pages'));
+      $access = ((user_access('view own user queue on user profile page') && $account->uid == $user->uid) || user_access('view all user queues on profile pages'));
       if (module_exists('views') && variable_get('smartqueue_users_'. $qid .'_display_user_page', 1) && $access) {
         $output = '';
         $view = views_get_view('smartqueue_users_user');
         $output .= views_build_view('embed', $view, array($account->uid));
-        if ($user->uid == $account->uid && user_access('manipulate own user node queue')) {
+        if ($user->uid == $account->uid && user_access('manipulate own user queue')) {
           $qid = smartqueue_users_get_qid();
           $sq = smartqueue_users_load_subqueue_by_uid($account->uid);
           if (is_array($sq)) {
@@ -312,7 +312,7 @@ function smartqueue_users_form_alter($fo
 }
 
 function smartqueue_users_perm() {
-  return array('manipulate own user node queue', 'manipulate all user node queues', 'view own user node queue on user profile page', 'view all user node queues on profile pages');
+  return array('manipulate own user queue', 'manipulate all user queues', 'view own user queue on user profile page', 'view all user queues on profile pages');
 }
 
 function smartqueue_users_get_qid() {