var $name = null; // User name.
var $id = null; // User id.
var $team_id = null; // Team id.
- var $role = null; // User role (user, client, comanager, manager, admin). TODO: remove when new roles are done.
var $role_id = null; // Role id.
var $rank = null; // User role rank.
var $client_id = null; // Client id for client user role.
$mdb2 = getConnection();
- $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.role_id, r.rank, r.rights, u.client_id, u.email, t.name as team_name,
+ $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role_id, r.rank, r.rights, u.client_id, u.email, t.name as team_name,
t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
t.tracking_mode, t.project_required, t.task_required, t.record_type,
t.bcc_email, t.plugins, t.config, t.lock_spec, t.workday_minutes, t.custom_logo
$this->name = $val['name'];
$this->id = $val['id'];
$this->team_id = $val['team_id'];
- $this->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, if it is still in use.
- if ($this->role > 0 && $this->rank > $this->role)
- $this->rank = $this->role; // TODO: remove after roles revamp.
- // Upgrade rank from legacy role, for user who does not yet have a role_id.
- if (!$this->rank && !$this->role_id && $this->role > 0)
- $this->rank = $this->role; // TODO: remove after roles revamp.
$this->client_id = $val['client_id'];
$this->email = $val['email'];
$this->lang = $val['lang'];
}
// isManager - determines whether current user is team manager.
+ // This is a legacy function that we are getting rid of by replacing with rights check.
function isManager() {
- return (ROLE_MANAGER == $this->role);
+ return $this->can('export_data'); // By default this is assigned to managers but not co-managers.
+ // Which is sufficient for now until we refactor all calls
+ // to this function and then remove it.
}
// isCoManager - determines whether current user is team comanager.
+ // This is a legacy function that we are getting rid of by replacing with rights check.
function isCoManager() {
- return (ROLE_COMANAGER == $this->role);
+ return ($this->can('manage_users') && !$this->can('export_data'));
}
// isClient - determines whether current user is a client.
}
// canManageTeam - determines whether current user is manager or co-manager.
+ // This is a legacy function that we are getting rid of by replacing with rights check.
function canManageTeam() {
- return (right_manage_team & $this->role);
+ return $this->can('manage_users'); // By default this is assigned to co-managers (an managers).
+ // Which is sufficient for now until we refactor all calls
+ // to this function and then remove it.
}
// isPluginEnabled checks whether a plugin is enabled for user.
// isDateLocked checks whether a specifc date is locked for modifications.
function isDateLocked($date)
{
- if ($this->isPluginEnabled('lk') && $this->lock_spec) {
- // Override for managers.
- if ($this->canManageTeam()) return false;
-
- require_once(LIBRARY_DIR.'/tdcron/class.tdcron.php');
- require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php');
-
- // Calculate the last occurrence of a lock.
- $last = tdCron::getLastOccurrence($this->lock_spec, time());
- $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last));
- if ($date->before($lockdate)) {
- return true;
- }
- }
- return false;
- }
+ if (!$this->isPluginEnabled('lk'))
+ return false; // Locking feature is disabled.
- // 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;
+ if (!$this->lock_spec)
+ return false; // There is no lock specification.
- // Create default roles if necessary.
- import ('ttRoleHelper');
- if (!ttRoleHelper::rolesExist()) ttRoleHelper::createDefaultRoles(); // TODO: refactor or remove after roles revamp.
+ if (!$this->behalf_id && $this->can('override_own_date_lock'))
+ return false; // User is working as self and can override own date lock.
- // Obtain new role id based on legacy role.
- $role_id = ttRoleHelper::getRoleByRank($this->role);
- if (!$role_id) return false; // Role not found, nothing to do.
+ if ($this->behalf_id && $this->can('override_date_lock'))
+ return false; // User is working on behalf of someone else and can override date lock.
- $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;
+ require_once(LIBRARY_DIR.'/tdcron/class.tdcron.php');
+ require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php');
+
+ // Calculate the last occurrence of a lock.
+ $last = tdCron::getLastOccurrence($this->lock_spec, time());
+ $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last));
+ if ($date->before($lockdate))
+ return true;
+
+ return false;
+ }
+
+ // 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.
+
+ if ($this->behalf_id && !$this->can('override_punch_mode'))
+ return false; // User is working on behalf of someone else and cannot override.
return true;
}
projects / timetracker.git / blobdiff