Finished refactoring ttAdmin class.

[timetracker.git] / WEB-INF / lib / ttUserHelper.class.php

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 28175080f00f1c71188050d9d0acfb781a753e3f..2ff774ff5d29325aec9f597fd4f9a062bc354d1d 100644 (file)
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -111,7 +111,7 @@ class ttUserHelper {
       $status_v = ', '.$mdb2->quote($fields['status']);
     }
     $created_ip_v = ', '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
-    $created_by_v = ', '.$mdb2->quote($user->id);
+    $created_by_v = ', '.$user->id;
 
     $sql = "insert into tt_users (name, login, password, group_id, org_id, role_id, client_id, rate, email, created, created_ip, created_by $status_f) values (".
       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).
@@ -134,7 +134,8 @@ class ttUserHelper {
           else
             $p['rate'] = str_replace(',', '.', $p['rate']);
 
-          $sql = "insert into tt_user_project_binds (project_id, user_id, rate, status) values(".$p['id'].",".$last_id.",".$p['rate'].", 1)";
+          $sql = "insert into tt_user_project_binds (project_id, user_id, group_id, org_id, rate, status)".
+            " values(".$p['id'].", $last_id, $group_id, $org_id, ".$p['rate'].", 1)";
           $affected = $mdb2->exec($sql);
         }
       }
@@ -175,7 +176,7 @@ class ttUserHelper {
       $status_part = ", status = $status";
     }
 
-    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
 
     $sql = "update tt_users set login = ".$mdb2->quote($fields['login']).
       "$pass_part, name = ".$mdb2->quote($fields['name']).
@@ -228,8 +229,14 @@ class ttUserHelper {
             if (is_a($affected, 'PEAR_Error')) die ($affected->getMessage());
           } else {
             // Record does not exist. Insert it.
-            ttUserHelper::insertBind($user_id, $project_id, $rate, 1);
-          }
+            ttUserHelper::insertBind(array(
+              'user_id' => $user_id,
+              'project_id' => $project_id,
+              'group_id' => $user->getGroup(),
+              'org_id' => $user->org_id,
+              'rate' => $rate,
+              'status' => ACTIVE));
+           }
         }
       }
     }
@@ -308,11 +315,21 @@ class ttUserHelper {
   }
 
   // insertBind - inserts a user to project bind into tt_user_project_binds table.
-  static function insertBind($user_id, $project_id, $rate, $status) {
+  static function insertBind($fields) {
+    global $user;
     $mdb2 = getConnection();
 
-    $sql = "insert into tt_user_project_binds (user_id, project_id, rate, status)
-      values($user_id, $project_id, ".$mdb2->quote($rate).", $status)";
+    // This may be used during import. Use the following until we have import refactored.
+    $group_id = $fields['group_id'] ? (int) $fields['group_id'] : $user->getGroup();
+    $org_id = $fields['org_id'] ? (int) $fields['org_id'] : $user->org_id;
+
+    $user_id = (int) $fields['user_id'];
+    $project_id = (int) $fields['project_id'];
+    $rate = $mdb2->quote($fields['rate']);
+    $status = $mdb2->quote($fields['status']);
+
+    $sql = "insert into tt_user_project_binds (user_id, project_id, group_id, org_id, rate, status)".
+      " values($user_id, $project_id, $group_id, $org_id, $rate, $status)";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }