X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=4a2320b40595d5fe389b26d69d01db1fe6f5d71d;hb=2d7329ba9ee02d996db189a87d79a02a877dd924;hp=73ec7a1e941abeb31b1ada038d4e6faf5a700e83;hpb=30634c0b3869d459552df1da06ec264fb1e6b086;p=timetracker.git

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 73ec7a1e..4a2320b4 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -167,6 +167,11 @@ class ttUser {
     return ($this->behalfUser ? $this->behalfUser->id : $this->id);
   }
 
+  // getName returns user name on behalf of whom the current user is operating.
+  function getName() {
+    return ($this->behalfUser ? $this->behalfUser->name : $this->name);
+  }
+
   // getQuotaPercent returns quota percent for active user.
   function getQuotaPercent() {
     return ($this->behalfUser ? $this->behalfUser->quota_percent : $this->quota_percent);
@@ -441,9 +446,7 @@ class ttUser {
       }
       if ($include_quota) {
         $quota = $val['quota_percent'];
-        if (null == $quota)
-          $quota = '100'; // Null means 100%. Perhaps enforce not NULLs in db and eliminate this check.
-        elseif (ttEndsWith($quota, '.00'))
+        if (ttEndsWith($quota, '.00'))
           $quota = substr($quota, 0, strlen($quota)-3); // Trim trailing ".00";
         elseif ($replaceDecimalMark)
           $quota = str_replace('.', $decimal_mark, $quota);
@@ -594,7 +597,7 @@ class ttUser {
         return false;
 
       // So far, so good. Check user now.
-      $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>MAX_RANK);
+      $options = array('status'=>ACTIVE,'max_rank'=>MAX_RANK);
       $users = $this->getUsers($options);
       foreach($users as $one_user) {
         if ($one_user['id'] == $this->behalf_id)
@@ -697,7 +700,8 @@ class ttUser {
       return false;
 
     // Mark user as deleted.
-    $sql = "update tt_users set status = NULL where id = $user_id".
+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
+    $sql = "update tt_users set status = null $modified_part where id = $user_id".
       " and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))