X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=621ab05fc4cd8f3c9ea8a675c8abb39c51d44efc;hb=7916f561fed6b50348f144fc411ca82ee9bd5ebb;hp=61680b9562b74f60d0e7ef95f31ca66f3aeabedc;hpb=bf4f6db7b2772e4cc3a0e382a7af35a144ce1c78;p=timetracker.git diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 61680b95..621ab05f 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -31,10 +31,6 @@ class ttUser { var $name = null; // User name. var $id = null; // User id. var $team_id = null; // Team id. - var $legacy_role = null; // Old user role (user, client, comanager, manager, admin). TODO: remove when new roles are done. - // Complete removal requires refactoring migrateLegacyRole, which is used in dbinstall.php. - // Perhaps, after doing an installer? - var $role_id = null; // Role id. var $rank = null; // User role rank. var $client_id = null; // Client id for client user role. @@ -97,13 +93,10 @@ class ttUser { $this->name = $val['name']; $this->id = $val['id']; $this->team_id = $val['team_id']; - $this->legacy_role = $val['role']; $this->role_id = $val['role_id']; $this->rights = explode(',', $val['rights']); $this->is_client = !in_array('track_own_time', $this->rights); $this->rank = $val['rank']; - // Downgrade rank to legacy ROLE_MANAGER rank, until we have sub-groups implemented. - if ($this->rank > ROLE_MANAGER) $this->rank = ROLE_MANAGER; $this->client_id = $val['client_id']; $this->email = $val['email']; $this->lang = $val['lang']; @@ -229,26 +222,14 @@ class ttUser { return false; } - // migrateLegacyRole makes changes to user database record and assigns a user to - // one of pre-defined roles, which are created if necessary. - // No changes to $this instance are done. - function migrateLegacyRole() { - // Do nothing if we already have a role_id. - if ($this->role_id) return false; - - // Create default roles if necessary. - import ('ttRoleHelper'); - if (!ttRoleHelper::rolesExist()) ttRoleHelper::createDefaultRoles(); // TODO: refactor or remove after roles revamp. - - // Obtain new role id based on legacy role. - $role_id = ttRoleHelper::getRoleByRank($this->legacy_role); - if (!$role_id) return false; // Role not found, nothing to do. + // canOverridePunchMode checks whether a user can override punch mode in a situation. + function canOverridePunchMode() + { + if (!$this->behalf_id && !$this->can('override_own_punch_mode')) + return false; // User is working as self and cannot override for self. - $mdb2 = getConnection(); - $sql = "update tt_users set role_id = $role_id where id = $this->id and team_id = $this->team_id"; - $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - return false; + if ($this->behalf_id && !$this->can('override_punch_mode')) + return false; // User is working on behalf of someone else and cannot override. return true; }