X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=f7b62344b11429c42bd5d84a87dd8ea08894c47c;hb=6c7a98f61e74aeae700b523729abb49ff19d3704;hp=37907c4d4ffc96aa8a7e8b73f7b2d2b86b853d0b;hpb=a95323ce1ae75fe97d5976b7d177f59dd278207b;p=timetracker.git diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 37907c4d..f7b62344 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -31,7 +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). + var $role_id = null; // Role id. + 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. var $behalf_name = null; // User name, on behalf of whom we are working. @@ -52,15 +53,14 @@ class ttUser { var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page). var $bcc_email = null; // Bcc email. var $currency = null; // Currency. - var $roles = 1; // Whether we use configurable roles. var $plugins = null; // Comma-separated list of enabled plugins. var $config = null; // Comma-separated list of miscellaneous config options. var $team = null; // Team name. 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) { @@ -71,11 +71,11 @@ class ttUser { $mdb2 = getConnection(); - $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.client_id, u.email, t.name as team_name, + $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, 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 - FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE "; + FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE "; if ($id) $sql .= "u.id = $id"; else @@ -93,7 +93,12 @@ 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->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']; @@ -117,7 +122,6 @@ class ttUser { $config_array = explode(',', $this->config); // Set user config options. - $this->roles = in_array('roles', $config_array); $this->show_holidays = in_array('show_holidays', $config_array); $this->punch_mode = in_array('punch_mode', $config_array); $this->allow_overlap = in_array('allow_overlap', $config_array); @@ -129,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. @@ -246,8 +207,9 @@ define('ROLE_SITE_ADMIN', 1024); // Site administrator. function isDateLocked($date) { if ($this->isPluginEnabled('lk') && $this->lock_spec) { - // Override for managers. - if ($this->canManageTeam()) return false; + + // Override. + if ($this->can('override_date_lock')) return false; require_once(LIBRARY_DIR.'/tdcron/class.tdcron.php'); require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php');