Remove all remote user records when an admin changes a user's authinstance

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

htdocs/admin/users/edit.php

@@ -210,7 +210,7 @@ function edituser_site_submit(Pieform $form, $values) {
         if ($USER->get('admin') || 
             ($USER->is_institutional_admin($authinst[$values['authinstance']]->institution) &&
              $USER->is_institutional_admin($authinst[$user->authinstance]->institution))) {
-            delete_records('auth_remote_user', 'authinstance', $user->authinstance, 'localusr', $user->id);
+            delete_records('auth_remote_user', 'localusr', $user->id);
             if ($authinst[$values['authinstance']]->authname != 'internal') {
                 if (isset($values['remoteusername']) && strlen($values['remoteusername']) > 0) {
                     $un = $values['remoteusername'];

htdocs/lib/institution.php

@@ -314,9 +314,14 @@ class Institution {
         }
         db_begin();
         // If the user is being authed by the institution they are
-        // being removed from, change them to internal auth
-        $authinstances = get_records_select_assoc('auth_instance', "
-            institution IN ('mahara', " . db_quote($this->name) . ')');
+        // being removed from, change them to internal auth, or if
+        // we can't find that, some other no institution auth.
+        $authinstances = get_records_select_assoc(
+            'auth_instance',
+            "institution IN ('mahara', ?)",
+            array($this->name),
+            "institution = 'mahara' DESC, authname = 'internal' DESC"
+        );
         $oldauth = $user->authinstance;
         if (isset($authinstances[$oldauth]) && $authinstances[$oldauth]->institution == $this->name) {
             foreach ($authinstances as $ai) {
@@ -324,6 +329,10 @@ class Institution {
                     $user->authinstance = $ai->id;
                     break;
                 }
+                else if ($ai->institution == 'mahara') {
+                    $user->authinstance = $ai->id;
+                    break;
+                }
             }
             delete_records('auth_remote_user', 'authinstance', $oldauth, 'localusr', $user->id);
             // If the old authinstance was external, the user may need