X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=e498cde0e822302559ec427d678d71c0287aeddc;hb=187a16b0ffee5ae6af51b010ff90a194048d3457;hp=cbfd62d1a262a4054e411441ed7c8d8955c1dc9d;hpb=2e2c4428476aebac3f30d481980d0c7f9614c5c0;p=timetracker.git diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index cbfd62d1..e498cde0 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -26,6 +26,8 @@ // | https://www.anuko.com/time_tracker/credits.htm // +----------------------------------------------------------------------+ +import('ttConfigHelper'); + class ttUser { var $login = null; // User login. var $name = null; // User name. @@ -54,15 +56,19 @@ class ttUser { var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page). var $bcc_email = null; // Bcc email. var $allow_ip = null; // Specification from where user is allowed access. + var $password_complexity = null; // Password complexity example. var $currency = null; // Currency. var $plugins = null; // Comma-separated list of enabled plugins. var $config = null; // Comma-separated list of miscellaneous config options. var $group = null; // Group name. - var $custom_logo = 0; // Whether to use a custom logo for team. + var $custom_logo = 0; // Whether to use a custom logo for group. var $lock_spec = null; // Cron specification for record locking. var $workday_minutes = 480; // Number of work minutes in a regular day. 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. + var $minutes_in_unit = 15; // Number of minutes in unit for Work units plugin. + var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin. + var $unit_totals_only = 0; // Totlas only option for the Work units plugin. // Constructor. function __construct($login, $id = null) { @@ -76,7 +82,7 @@ class ttUser { $sql = "SELECT u.id, u.login, u.name, u.group_id, u.role_id, r.rank, r.name as role_name, r.rights, u.client_id, u.email, g.name as group_name, g.currency, g.lang, g.decimal_mark, g.date_format, g.time_format, g.week_start, g.tracking_mode, g.project_required, g.task_required, g.record_type, - g.bcc_email, g.allow_ip, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo + g.bcc_email, g.allow_ip, g.password_complexity, g.plugins, g.config, g.lock_spec, g.workday_minutes, g.custom_logo FROM tt_users u LEFT JOIN tt_groups g ON (u.group_id = g.id) LEFT JOIN tt_roles r on (r.id = u.role_id) WHERE "; if ($id) $sql .= "u.id = $id"; @@ -113,6 +119,7 @@ class ttUser { $this->record_type = $val['record_type']; $this->bcc_email = $val['bcc_email']; $this->allow_ip = $val['allow_ip']; + $this->password_complexity = $val['password_complexity']; $this->group = $val['group_name']; $this->currency = $val['currency']; $this->plugins = $val['plugins']; @@ -121,15 +128,21 @@ class ttUser { $this->custom_logo = $val['custom_logo']; $this->config = $val['config']; - $config_array = explode(',', $this->config); - + $config = new ttConfigHelper($this->config); // Set user config options. - $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); - $this->future_entries = in_array('future_entries', $config_array); - $this->uncompleted_indicators = in_array('uncompleted_indicators', $config_array); - + $this->show_holidays = $config->getDefinedValue('show_holidays'); + $this->punch_mode = $config->getDefinedValue('punch_mode'); + $this->allow_overlap = $config->getDefinedValue('allow_overlap'); + $this->future_entries = $config->getDefinedValue('future_entries'); + $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators'); + if ($this->isPluginEnabled('wu')) { + $minutes_in_unit = $config->getIntValue('minutes_in_unit'); + if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit; + $first_unit_threshold = $config->getIntValue('1st_unit_threshold'); + if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold; + $this->unit_totals_only = $config->getDefinedValue('unit_totals_only'); + } + // Set "on behalf" id and name. if (isset($_SESSION['behalf_id'])) { $this->behalf_id = $_SESSION['behalf_id']; @@ -148,38 +161,11 @@ class ttUser { return in_array($do_something, $this->rights); } - // isAdmin - determines whether current user is admin. - function isAdmin() { - 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 $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 ($this->can('manage_users') && !$this->can('export_data')); - } - // isClient - determines whether current user is a client. function isClient() { 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 $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. function isPluginEnabled($plugin) { @@ -370,7 +356,7 @@ class ttUser { $mdb2 = getConnection(); - $sql = "select u.id, u.name, u.login, u.role_id, u.status, u.rate, u.email from tt_users u". + $sql = "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u". " left join tt_roles r on (u.role_id = r.id)". " where u.id = $user_id and u.group_id = $this->group_id and u.status is not null". " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self. @@ -454,6 +440,38 @@ class ttUser { return true; } + // markUserDeleted marks a user in group as deleted. + function markUserDeleted($user_id) { + if (!$this->can('manage_users') || $this->id == $user_id) + return false; + + // Make sure we operate on a legit user. + $user_details = $this->getUser($user_id); + if (!$user_details) return false; + + $mdb2 = getConnection(); + + // Mark user to project binds as deleted. + $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) + return false; + + // Mark user favorite reports as deleted. + $sql = "update tt_fav_reports set status = NULL where user_id = $user_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) + return false; + + // Mark user as deleted. + $sql = "update tt_users set status = NULL where id = $user_id and group_id = ".$this->group_id; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) + return false; + + return true; + } + // enablePlugin either enables or disables a specific plugin for group. function enablePlugin($plugin, $enable = true) {