X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUserHelper.class.php;h=521bc8b7a0a228b5cbaa04c3cc875a934a2a9517;hb=47676f16efdde0b36a4ed09d2ab0476584aeb2a6;hp=a8bfe6229834f6c4115257db761b151ce49955b4;hpb=fadb4320a14d2afac38ddd2ac66b1738a483eebd;p=timetracker.git

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index a8bfe622..521bc8b7 100644
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -31,21 +31,6 @@ import('ttTeamHelper');
 // Class ttUserHelper contains helper functions for operations with users.
 class ttUserHelper {
 
-  // The getUserDetails function returns user details.
-  static function getUserDetails($user_id) {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql =  "select * from tt_users where id = $user_id";
-    $res = $mdb2->query($sql);
-
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      return $val;
-    }
-    return false;
-  }
-
   // The getUserName function returns user name.
   static function getUserName($user_id) {
     $mdb2 = getConnection();
@@ -109,14 +94,14 @@ class ttUserHelper {
 
   // insert - inserts a user into database.
   static function insert($fields, $hash = true) {
+    global $user;
     $mdb2 = getConnection();
 
     $password = $mdb2->quote($fields['password']);
     if($hash)
       $password = 'md5('.$password.')';
     $email = isset($fields['email']) ? $fields['email'] : '';
-    $team_id = (int) $fields['team_id'];
-    $role = (int) $fields['role'];
+    $group_id = (int) $fields['group_id'];
     $rate = str_replace(',', '.', isset($fields['rate']) ? $fields['rate'] : 0);
     if($rate == '')
       $rate = 0;
@@ -124,10 +109,12 @@ class ttUserHelper {
       $status_f = ', status';
       $status_v = ', '.$mdb2->quote($fields['status']);
     }
+    $created_ip_v = ', '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
+    $created_by_v = ', '.$mdb2->quote($user->id);
 
-    $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, group_id, role_id, client_id, rate, email, created, created_ip, created_by $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, $group_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";
     $affected = $mdb2->exec($sql);
 
     // Now deal with project assignment.
@@ -167,10 +154,10 @@ class ttUserHelper {
     // Prepare query parts.
     if (isset($fields['password']))
       $pass_part = ', password = md5('.$mdb2->quote($fields['password']).')';
-    if (right_assign_roles & $user->rights) {
-      if (isset($fields['role'])) {
-        $role = (int) $fields['role'];
-        $role_part = ", role = $role";
+    if (in_array('manage_users', $user->rights)) {
+      if (isset($fields['role_id'])) {
+        $role_id = (int) $fields['role_id'];
+        $role_id_part = ", role_id = $role_id";
       }
       if (array_key_exists('client_id', $fields)) // Could be NULL.
         $client_part = ", client_id = ".$mdb2->quote($fields['client_id']);
@@ -187,9 +174,11 @@ class ttUserHelper {
       $status_part = ", status = $status";
     }
 
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+
     $sql = "update tt_users set login = ".$mdb2->quote($fields['login']).
       "$pass_part, name = ".$mdb2->quote($fields['name']).
-      "$role_part $client_part $rate_part $status_part, email = ".$mdb2->quote($fields['email']).
+      "$role_id_part $client_part $rate_part $modified_part $status_part, email = ".$mdb2->quote($fields['email']).
       " where id = $user_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
@@ -202,7 +191,7 @@ class ttUserHelper {
       // otherwise de-activate the bind (set its status to inactive). This will keep the bind
       // and its rate in database for reporting.
 
-      $all_projects = ttTeamHelper::getAllProjects($user->team_id);
+      $all_projects = ttTeamHelper::getAllProjects($user->group_id);
       $assigned_projects = isset($fields['projects']) ? $fields['projects'] : array();
 
       foreach($all_projects as $p) {
@@ -246,101 +235,6 @@ class ttUserHelper {
     return true;
   }
 
-  // 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;
-
-    // Preliminary checks. Only managers, co-managers, and admin can do this.
-    if (!$user->canManageTeam() && !$user->isAdmin())
-      return false;
-
-    // Tho logic is different depending on who is doing the operation.
-    // Co-manager and admin - mark user deleted.
-    // Manager - mark user deleted. If manager is the only account in team, mark team items deleted.
-
-    // admin part.
-    if ($user->isAdmin()) {
-      // Mark user binds as deleted.
-      $sql = "update tt_user_project_binds 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);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-    } elseif ($user->isCoManager()) {
-      // Mark user binds as deleted.
-      $sql = "update tt_user_project_binds 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);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-    } elseif ($user->isManager()) {
-      $user_count = ttTeamHelper::getUserCount($user->team_id);
-
-      // Marking deleted a manager with active users is not allowed.
-       if (($user_id == $user->id) && ($user_count > 1))
-        return false;
-
-      if (1 == $user_count) {
-        // Mark tasks deleted.
-        if (!ttTeamHelper::markTasksDeleted($user->team_id))
-          return false;
-
-        // Mark projects deleted.
-        $sql = "update tt_projects set status = NULL where team_id = $user->team_id";
-        $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error'))
-          return false;
-
-        // Mark clients deleted.
-        $sql = "update tt_clients set status = NULL where team_id = $user->team_id";
-        $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error'))
-          return false;
-
-        // Mark custom fields deleted.
-        $sql = "update tt_custom_fields set status = NULL where team_id = $user->team_id";
-        $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error'))
-          return false;
- 
-        // Mark team deleted.
-        $sql = "update tt_teams set status = NULL where id = $user->team_id";
-        $affected = $mdb2->exec($sql);
-        if (is_a($affected, 'PEAR_Error'))
-          return false;
-      }
-
-      // Mark user binds as deleted.
-      $sql = "update tt_user_project_binds 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);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-    }
-
-    return true;
-  }
-
   // The delete function permanently deletes a user and all associated data.
   static function delete($user_id) {
     $mdb2 = getConnection();
@@ -395,10 +289,10 @@ class ttUserHelper {
   static function saveTmpRef($ref, $user_id) {
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_tmp_refs where timestamp + 86400 < now()";
+    $sql = "delete from tt_tmp_refs where created < now() - interval 1 hour";
     $affected = $mdb2->exec($sql);
 
-    $sql = "insert into tt_tmp_refs (ref, user_id) values(".$mdb2->quote($ref).", $user_id)";
+    $sql = "insert into tt_tmp_refs (created, ref, user_id) values(now(), ".$mdb2->quote($ref).", $user_id)";
     $affected = $mdb2->exec($sql);
   }
 
@@ -454,4 +348,13 @@ class ttUserHelper {
     }
     return true;
   }
+
+  // updateLastAccess - updates last access info for user in db.
+  static function updateLastAccess() {
+    global $user;
+    $mdb2 = getConnection();
+    $accessed_ip = $mdb2->quote($_SERVER['REMOTE_ADDR']);
+    $sql = "update tt_users set accessed = now(), accessed_ip = $accessed_ip where id = $user->id";
+    $mdb2->exec($sql);
+  }
 }