X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/fadb4320a14d2afac38ddd2ac66b1738a483eebd..f1c11908a996c1a0d9582ef6d32490e5ce15f02d:/WEB-INF/lib/ttUserHelper.class.php

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index a8bfe622..f88f195d 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -125,9 +125,9 @@ class ttUserHelper {
       $status_v = ', '.$mdb2->quote($fields['status']);
     }
 
-    $sql = "insert into tt_users (name, login, password, team_id, role, client_id, rate, email $status_f) values (".
+    $sql = "insert into tt_users (name, login, password, team_id, role, role_id, client_id, rate, email $status_f) values (".
       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).
-      ", $password, $team_id, $role, ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email)." $status_v)";
+      ", $password, $team_id, $role, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email)." $status_v)";
     $affected = $mdb2->exec($sql);
 
     // Now deal with project assignment.
@@ -247,8 +247,6 @@ class ttUserHelper {
   }
 
   // markDeleted - marks user and its associated things as deleted.
-  // TODO: address the problem when a deleted user has a scheduled notification configured,
-  // in which case all other notifications may stop working because of MySQL syntax error.
   static function markDeleted($user_id) {
     $mdb2 = getConnection();
     global $user;
@@ -269,6 +267,12 @@ class ttUserHelper {
       if (is_a($affected, 'PEAR_Error'))
         return false;
 
+      // Mark favorite reports as deleted.
+      $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
+
       // Mark user as deleted.
       $sql = "update tt_users set status = NULL where id = $user_id";
       $affected = $mdb2->exec($sql);
@@ -282,6 +286,12 @@ class ttUserHelper {
       if (is_a($affected, 'PEAR_Error'))
         return false;
 
+      // Mark favorite reports as deleted.
+      $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
+
       // Mark user as deleted.
       $sql = "update tt_users set status = NULL where id = $user_id and team_id = ".$user->team_id;
       $affected = $mdb2->exec($sql);
@@ -331,6 +341,12 @@ class ttUserHelper {
       if (is_a($affected, 'PEAR_Error'))
         return false;
 
+      // Mark favorite reports as deleted.
+      $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error'))
+        return false;
+
       // Mark user as deleted.
       $sql = "update tt_users set status = NULL where id = $user_id and team_id = ".$user->team_id;
       $affected = $mdb2->exec($sql);