Merge lp:~canonical-isd-hackers/drupal-teams/manual-role-persistence into lp:drupal-teams/6.x

[Stuart Metcalfe]

[Stuart Metcalfe (stuartmetcalfe)]

Revision 7 is only diff from trunk. Fixes bug #375041. Functionality copied from Wordpress and adapted to drupal API.

[Łukasz Czyżykowski (lukasz-czyzykowski)]

review: Approve

[Stuart Metcalfe (stuartmetcalfe)]

review: Approve

=== modified file 'openid_teams.module'
--- openid_teams.module	2009-03-16 14:18:31 +0000
+++ openid_teams.module	2009-05-11 20:26:38 +0000
@@ -94,7 +94,7 @@
  * Implementation of hook_form_alter.
  *
  * Add the ability to limit login/registration to members of known teams to the
- * drupal 
+ * drupal
  */
 function openid_teams_form_alter(&$form, &$form_state, $form_id) {
   if ($form_id == 'user_admin_settings') {
@@ -457,7 +457,7 @@
         $request['openid.lp.query_membership'] = join(',', $all_teams);
       }
       return $request;
-      
+
     case 'extension':
       return 'lp';
   }
@@ -496,14 +496,19 @@
       module_load_include('inc', 'user', 'user.pages');
       user_logout();
     }
+    clear_team_roles($account);
+    $current = get_role_ids_assigned_to_user($account);
     $assigned = array();
     foreach ($teams as $mid) {
-      if (isset($roles_map[$mid]) && !in_array($roles_map[$mid], $assigned)) {
+      if (isset($roles_map[$mid]) && should_assign_role($roles_map[$mid], $current, $assigned)) {
         db_query("INSERT INTO {users_roles} (uid, rid) VALUES (%d, '%s')",
                  $account->uid, $roles_map[$mid]);
         $assigned[] = $roles_map[$mid];
       }
     }
+    if (sizeof($assigned) > 0) {
+      variable_set("openid_assigned_roles_{$account->uid}", join(',', $assigned));
+    }
     module_invoke_all('openid_teams_response', $raw_teams, $server);
   }
   elseif ($op == 'logout') {
@@ -512,25 +517,44 @@
 }
 
 /**
- * Clear the stored roles for the specified account
- *
- * Updated version of this function provided by feedback from Drupal CVS
- * administrator feedback (AjK 13/10/08).
+ * Clear the openid-assigned roles for the specified account
  *
  * @param object $account The user object
  */
 function clear_team_roles($account) {
-  $all_rids = array();
-  foreach (get_teams_roles_map() as $rids) {
-    $all_rids = array_merge($all_rids, $rids);
-  }
-  $sql = 'DELETE FROM {users_roles} WHERE uid = %d';
-  if (count($all_rids)) {
-    $sql .= ' AND rid IN ('.implode(',', array_fill(0, count($all_rids), '%d')).
-            ')';
-  }
-  array_unshift($all_rids, $account->uid);
-  db_query($sql, $all_rids);
+  $assigned_roles = variable_get("openid_assigned_roles_{$account->uid}", "");
+  if (!empty($assigned_roles)) {
+    $sql = 'DELETE FROM {users_roles} WHERE uid = %d AND rid IN (%s)';
+    db_query($sql, array($account->uid, $assigned_roles));
+  }
+  variable_del("openid_assigned_roles_{$account->uid}");
+}
+
+/**
+ * Check if the role has already been assigned to the user manually or in this login session
+ *
+ * @param integer $rid
+ * @param array $current_roles
+ * @param array $assigned_roles
+ * @return boolean
+ */
+function should_assign_role($rid, $current_roles, $assigned_roles) {
+  return !in_array($rid, $current_roles) && !in_array($rid, $assigned_roles);
+}
+
+/**
+ * Get the role ids already assigned to the user
+ *
+ * @param object $user
+ * @return array
+ */
+function get_role_ids_assigned_to_user($user) {
+  $query = db_query('SELECT rid FROM users_roles WHERE uid=%d', $user->uid);
+  $rids = array();
+  while ($row = db_fetch_object($query)) {
+    $rids[] = $row->rid;
+  }
+  return $rids;
 }
 
 /**