}
// isClientRole determines if the role is a "client" role.
- // This simply means the role has no "data_entry" right.
+ // This simply means the role has no "track_own_time" right.
static function isClientRole($role_id) {
global $user;
$mdb2 = getConnection();
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
if ($val['rights']) {
- return !in_array('data_entry', explode(',', $val['rights']));
+ return !in_array('track_own_time', explode(',', $val['rights']));
}
}
return false;
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
if ($val['id'])
- return $val;
+ return $val['id'];
}
return false;
}
$mdb2 = getConnection();
- $rights_client = 'view_own_data,manage_own_settings';
- $rights_user = 'data_entry,view_own_data,manage_own_settings,view_users';
- $rights_supervisor = $rights_user.',on_behalf_data_entry,view_data,override_punch_mode,swap_roles,approve_timesheets';
+ $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
+ $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_users';
+ $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,swap_roles,approve_timesheets';
$rights_comanager = $rights_supervisor.',manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
$rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
global $i18n;
global $user;
- $rights_client = 'view_own_data,manage_own_settings';
- $rights_user = 'data_entry,view_own_data,manage_own_settings,view_users';
- $rights_supervisor = $rights_user.',on_behalf_data_entry,view_data,override_punch_mode,swap_roles,approve_timesheets';
+ $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
+ $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_users';
+ $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,swap_roles,approve_timesheets';
$rights_comanager = $rights_supervisor.',manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
$rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';