Refactored ttRoleHelper::getRoleByRank().

[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 bd5e46b..42d7c91 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']).
@@ -120,11 +120,7 @@ class ttUserHelper {
 
     // Now deal with project assignment.
     if (!is_a($affected, 'PEAR_Error')) {
-      $sql = "SELECT LAST_INSERT_ID() AS last_id";
-      $res = $mdb2->query($sql);
-      $val = $res->fetchRow();
-      $last_id = $val['last_id'];
-
+      $last_id = $mdb2->lastInsertID('tt_users', 'id');
       $projects = isset($fields['projects']) ? $fields['projects'] : array();
       if (count($projects) > 0) {
         // We have at least one project assigned. Insert corresponding entries in tt_user_project_binds table.
@@ -176,7 +172,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']).
@@ -229,8 +225,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));
+           }
         }
       }
     }
@@ -309,25 +311,12 @@ class ttUserHelper {
   }
 
   // insertBind - inserts a user to project bind into tt_user_project_binds table.
-  static function insertBind($user_id, $project_id, $rate, $status) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getActiveGroup();
-    $org_id = $user->org_id;
-    $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, ".$mdb2->quote($rate).", $status)";
-    $affected = $mdb2->exec($sql);
-    return (!is_a($affected, 'PEAR_Error'));
-  }
-
-    // insertBind2 - inserts a user to project bind into tt_user_project_binds table.
-  static function insertBind2($fields) {
+  static function insertBind($fields) {
     global $user;
     $mdb2 = getConnection();
 
     // This may be used during import. Use the following until we have import refactored.
-    $group_id = $fields['group_id'] ? (int) $fields['group_id'] : $user->getActiveGroup();
+    $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'];