X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=0a104888486f0e04930565a3d164a6ca1cb62cd2;hb=182ed39acb3600d991ff4742848a75c5ed2ba728;hp=5ead08bc8ca0bec895f513af4ade4a5373fb35f5;hpb=09bb840079b835529b298c4d84a9a2e0f8a4bdb8;p=timetracker.git diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 5ead08bc..0a104888 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -31,8 +31,8 @@ class ttUser { 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 $role_name = null; // Role name. var $rank = null; // User role rank. var $client_id = null; // Client id for client user role. var $behalf_id = null; // User id, on behalf of whom we are working. @@ -60,8 +60,8 @@ class ttUser { var $custom_logo = 0; // Whether to use a custom logo for team. var $lock_spec = null; // Cron specification for record locking. var $workday_minutes = 480; // Number of work minutes in a regular day. - var $rights = 0; // A mask of user rights. - var $rights_array = array(); // An array of user rights, planned replacement of array mask. + var $rights = array(); // An array of user rights such as 'track_own_time', etc. + var $is_client = false; // Whether user is a client as determined by missing 'track_own_time' right. // Constructor. function __construct($login, $id = null) { @@ -72,7 +72,7 @@ class ttUser { $mdb2 = getConnection(); - $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.role_id, r.rank, 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.name as role_name, 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 @@ -94,15 +94,11 @@ class ttUser { $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->role_name = $val['role_name']; + $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']; @@ -137,92 +133,49 @@ class ttUser { $this->behalf_id = $_SESSION['behalf_id']; $this->behalf_name = $_SESSION['behalf_name']; } - - // Set user rights. - if ($this->role == ROLE_USER) { - $this->rights = right_data_entry|right_view_charts|right_view_reports; - // TODO: get customized rights from the database instead. - // $this->rights_array[] = "data_entry"; // Enter time and expense records into Time Tracker. - // $this->rights_array[] = "view_own_data"; // View own reports and charts. - // $this->rights_array[] = "manage_own_settings"; // Edit own settings. - // $this->rights_array[] = "view_users"; // View user names and roles in a group. - } elseif ($this->role == ROLE_CLIENT) { - $this->rights = right_view_reports|right_view_invoices; // TODO: how about right_view_charts, too? - // $this->rights_array[] = "view_own_data"; // View own reports, charts, and invoices. - // $this->rights_array[] = "manage_own_settings"; // Edit own settings. - } elseif ($this->role == ROLE_COMANAGER) { - $this->rights = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team; - // $this->rights_array[] = "data_entry"; // Enter time and expense records into Time Tracker. - // $this->rights_array[] = "view_own_data"; // View own reports and charts. - // $this->rights_array[] = "manage_own_settings"; // Edit own settings. - // $this->rights_array[] = "view_users"; // View user names and roles in a group. - // $this->rights_array[] = "on_behalf_data_entry";// Can enter data on behalf of lower roles. - // $this->rights_array[] = "view_data"; // Can view data for lower roles. - $this->rights_array[] = "override_punch_mode"; // Can input any start and finish times for self and lower roles. - // TODO: get rights from the database instead. - } elseif ($this->role == ROLE_MANAGER) { - $this->rights = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team|right_assign_roles|right_export_team; - $this->rights_array[] = "override_punch_mode"; // Can input any start and finish times for self and lower roles. - } elseif ($this->role == ROLE_SITE_ADMIN) { - $this->rights = right_administer_site; - } - -/* -// TODO: redesign of user rights and roles is currently ongoing. -// As we run our of bits for sure at some point, rights should be strings instead, -// for example: "data_entry". -// Also, we need rights editor page and team-customized roles. -// Move this stuff from here to ttUser class. -// -// User access rights - bits that collectively define an access mask to the system (a role). -// We'll have some bits here (1,2, etc...) reserved for future use. -define('right_data_entry', 4); // Right to enter work hours and expenses. -define('right_view_charts', 8); // Right to view charts. -define('right_view_reports', 16); // Right to view reports. -define('right_view_invoices', 32); // Right to view invoices. -define('right_manage_team', 64); // Right to manage team. Note that this is not full access to team. -define('right_assign_roles', 128); // Right to assign user roles. -define('right_export_team', 256); // Right to export team data to a file. -define('right_administer_site', 1024); // Admin account right to manage the application as a whole. - -// User roles. -define('ROLE_USER', 4); // Regular user. -define('ROLE_CLIENT', 16); // Client (to view reports and invoices). -define('ROLE_COMANAGER', 68); // Team co-manager. Can do many things but not as much as team manager. -define('ROLE_MANAGER', 324); // Team manager. Can do everything for a team. -define('ROLE_SITE_ADMIN', 1024); // Site administrator. -*/ } } - // The getActiveUser returns user id on behalf of whom current user is operating. + // The getActiveUser returns user id on behalf of whom the current user is operating. function getActiveUser() { return ($this->behalf_id ? $this->behalf_id : $this->id); } + // can - determines whether user has a right to do something. + function can($do_something) { + return in_array($do_something, $this->rights); + } + // isAdmin - determines whether current user is admin (has right_administer_site). function isAdmin() { - return (right_administer_site & $this->role); + return $this->can('administer_site'); } // 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. function isClient() { - return (ROLE_CLIENT == $this->role); + return $this->is_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. @@ -253,43 +206,38 @@ define('ROLE_SITE_ADMIN', 1024); // Site administrator. // 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; + if (!$this->isPluginEnabled('lk')) + return false; // Locking feature is disabled. - require_once(LIBRARY_DIR.'/tdcron/class.tdcron.php'); - require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php'); + if (!$this->lock_spec) + return false; // There is no lock specification. - // 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->behalf_id && $this->can('override_own_date_lock')) + return false; // User is working as self and can override own date lock. - // 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->behalf_id && $this->can('override_date_lock')) + return false; // User is working on behalf of someone else and can override date lock. - // Create default roles if necessary. - import ('ttRoleHelper'); - if (!ttRoleHelper::rolesExist()) ttRoleHelper::createDefaultRoles(); // TODO: refactor or remove after roles revamp. + require_once(LIBRARY_DIR.'/tdcron/class.tdcron.php'); + require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php'); - // 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. + // 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; - $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; + 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; }