Web: when delete a user, delete team_admin entries for that user.

Ignore team_admin entries for nonexistent users.
BOINC · Sep 25, 2023 · a7f6b66 · a7f6b66
1 parent 99a60c4
commit a7f6b66
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/html/inc/delete_account.inc b/html/inc/delete_account.inc
@@ -197,6 +197,7 @@ function wipe_account($user) {
     BoincHostAppVersion::delete_for_user($user->id);
     BoincHost::delete_for_user($user->id);
     BoincConsent::delete_for_user($user->id);
+    BoincTeamAdmin::delete("userid=$user->id");
 
     // final action
     delete_user($user);  //from user_util.inc

diff --git a/html/inc/forum_email.inc b/html/inc/forum_email.inc
@@ -52,6 +52,7 @@ function mail_report_list($forum, $subject, $body, $must_send=false) {
         $admins = BoincTeamAdmin::enum("teamid=$team->id");
         foreach ($admins as $admin) {
             $u = BoincUser::lookup_id($admin->userid);
+            if (!$u) continue;
             $success &= send_email($u, $subject, $body);
         }
         break;

diff --git a/html/inc/team.inc b/html/inc/team.inc
@@ -365,6 +365,7 @@ function admin_list($teamid) {
     $admins = BoincTeamAdmin::enum("teamid=$teamid");
     foreach ($admins as $admin) {
         $user = BoincUser::lookup_id($admin->userid);
+        if (!$user) continue;
         $u[] = $user;
     }
     return $u;

diff --git a/html/user/team_admins.php b/html/user/team_admins.php
@@ -26,6 +26,7 @@
 
 function show_admin($user, $admin) {
     $admin_user = BoincUser::lookup_id($admin->userid);
+    if (!$admin_user) return;
     $tokens = url_tokens($user->authenticator);
     $date = date_str($admin->create_time);
     echo "<tr>