Merge lp:~l3on/drupal-teams/7.x-dev_fixes into lp:~ubuntu-drupal-devs/drupal-teams/7.x-dev

[Leo Iannacone]

Fixed variable name.

[lp:~l3on/drupal-teams/7.x-dev_fixes]

5. By Leo Iannacone on 2012-08-29

Fix variable name "s/acount/account/"

6. By Leo Iannacone on 2012-09-17

Fixed drupal teams query - Thanks to Devid Antonio Filoni (d.filoni)

Unmerged revisions

6. By Leo Iannacone on 2012-09-17

Fixed drupal teams query - Thanks to Devid Antonio Filoni (d.filoni)

5. By Leo Iannacone on 2012-08-29

Fix variable name "s/acount/account/"

4. By Leo Iannacone on 2012-07-21

Fix variable name

=== modified file 'openid_teams.module'
--- openid_teams.module	2011-03-07 06:49:19 +0000
+++ openid_teams.module	2012-09-17 13:16:33 +0000
@@ -464,7 +464,7 @@
     ->condition('sid', $form_state['values']['sid'])
     ->execute();
    db_update('openid_teams_roles')
-    ->fields(array('sid' => 'NULL'))
+    ->fields(array('sid' => 0))
     ->condition('sid', $form_state['values']['sid'])
     ->execute();
   $form_state['redirect'] = 'admin/config/services/openid_teams/trusted';
@@ -516,7 +516,7 @@
       $teams     = get_approved_team_mappings($response['openid.lp.is_member'],
                                               $server);
     }
-    if (empty($teams) && variable_get('openid_teams_limit_to_known', FALSE) && $user->uid != 1) {
+    if (empty($teams) && variable_get('openid_teams_limit_to_known', FALSE) && $account->uid != 1) {
       module_load_include('inc', 'user', 'user.pages');
       user_logout();
     }
@@ -558,9 +558,11 @@
 function clear_team_roles($account) {
   $assigned_roles = variable_get("openid_assigned_roles_{$account->uid}", "");
   if (!empty($assigned_roles)) {
+    $roles = array();
+    $roles = explode(',', $assigned_roles);
     db_delete('users_roles')
       ->condition('uid', $account->uid)
-      ->condition('rid', $acount->roles, 'IN')
+      ->condition('rid', $roles, 'IN')
       ->execute();
   }
   variable_del("openid_assigned_roles_{$account->uid}");
@@ -688,11 +690,11 @@
   $map_ids = array();
   if (!is_array($mapped_roles)) {
     $mapped_roles = array();
-    $result = db_select('openid_teams_roles', 'otr');
-    $result->join('openid_teams_trusted', 'ott', 'otr.sid = ott.sid');
-    $result->fields('otr', array('tid', 'rid', 'team'))
-      ->fields('ott', array('server'))
-      ->execute();
+    $query = db_select('openid_teams_roles', 'otr');
+    $query->join('openid_teams_trusted', 'ott', 'otr.sid = ott.sid');
+    $query->fields('otr', array('tid', 'rid', 'team'))
+      ->fields('ott', array('server'));
+    $result = $query->execute();
     foreach ($result as $map) {
       $mapped_roles[$map->team][] = $map;
     }