var $login = null; // User login.
var $name = null; // User name.
var $id = null; // User id.
- var $team_id = null; // Team id.
+ var $group_id = null; // Group id.
var $role_id = null; // Role id.
var $role_name = null; // Role name.
var $rank = null; // User role rank.
var $future_entries = 0; // Whether to allow creating future entries.
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 $currency = null; // Currency.
var $plugins = null; // Comma-separated list of enabled plugins.
var $config = null; // Comma-separated list of miscellaneous config options.
$mdb2 = getConnection();
- $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
- 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 ";
+ $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
+ 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";
else
$this->login = $val['login'];
$this->name = $val['name'];
$this->id = $val['id'];
- $this->team_id = $val['team_id'];
+ $this->group_id = $val['group_id'];
$this->role_id = $val['role_id'];
$this->role_name = $val['role_name'];
$this->rights = explode(',', $val['rights']);
$this->task_required = $val['task_required'];
$this->record_type = $val['record_type'];
$this->bcc_email = $val['bcc_email'];
- $this->team = $val['team_name'];
+ $this->allow_ip = $val['allow_ip'];
+ $this->team = $val['group_name'];
$this->currency = $val['currency'];
$this->plugins = $val['plugins'];
$this->lock_spec = $val['lock_spec'];
// Do a query with inner join to get assigned projects.
$sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p
inner join tt_user_project_binds upb on (upb.user_id = ".$this->getActiveUser()." and upb.project_id = p.id and upb.status = 1)
- where p.team_id = $this->team_id and p.status = 1 order by p.name";
+ where p.group_id = $this->group_id and p.status = 1 order by p.name";
+ $res = $mdb2->query($sql);
+ if (!is_a($res, 'PEAR_Error')) {
+ while ($val = $res->fetchRow()) {
+ $result[] = $val;
+ }
+ }
+ return $result;
+ }
+
+ // getAssignedTasks - returns an array of assigned tasks.
+ function getAssignedTasks()
+ {
+ // Start with projects;
+ $projects = $this->getAssignedProjects();
+ if (!$projects) return false;
+
+ // Build an array of task ids.
+ $task_ids = array();
+ foreach($projects as $project) {
+ $one_project_tasks = $project['tasks'] ? explode(',', $project['tasks']) : array();
+ $task_ids = array_unique(array_merge($task_ids, $one_project_tasks));
+ }
+ if (!$task_ids) return false;
+
+ // Get task descriptions.
+ $result = array();
+ $mdb2 = getConnection();
+ $tasks = implode(',', $task_ids); // This is a comma-separated list of task ids.
+
+ $sql = "select id, name, description from tt_tasks".
+ " where group_id = $this->group_id and status = 1 and id in ($tasks) order by name";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
if (isset($options['max_rank']) || $skipClients || isset($options['include_role']))
$left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
- $where_part = " where u.team_id = $this->team_id";
- if (isset($options['status'])) $where_part .= ' and u.status = '.(int)$options['status'];
+ $where_part = " where u.group_id = $this->group_id";
+ if (isset($options['status']))
+ $where_part .= ' and u.status = '.(int)$options['status'];
+ else
+ $where_part .= ' and u.status is not null';
if ($includeSelf) {
$where_part .= " and (u.id = $this->id || r.rank <= ".(int)$options['max_rank'].')';
} else {
if (isset($options['max_rank'])) $where_part .= ' and r.rank <= '.(int)$options['max_rank'];
}
- $sql = $select_part.$from_part.$left_joins.$where_part;
+ $order_part = " order by upper(u.name)";
+
+ $sql = $select_part.$from_part.$left_joins.$where_part.$order_part;
$res = $mdb2->query($sql);
$user_list = array();
if (is_a($res, 'PEAR_Error'))
return $user_list;
}
+ // getUser function is used to manage users in group and returns user details.
+ // At the moment, the function is used for user edits and deletes.
+ function getUser($user_id) {
+ if (!$this->can('manage_users')) return false;
+
+ $mdb2 = getConnection();
+
+ $sql = "select u.id, u.name, u.login, u.role_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.
+ $res = $mdb2->query($sql);
+ if (!is_a($res, 'PEAR_Error')) {
+ $val = $res->fetchRow();
+ return $val;
+ }
+ return false;
+ }
+
// checkBehalfId checks whether behalf_id is appropriate.
// On behalf user must be active and have lower rank.
function checkBehalfId() {
projects / timetracker.git / blobdiff