X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=e50d9a3ea2fe3a15ea413315c48b86a03a94fa30;hb=f05a2db179417c20c7d841f0363bca4988c8a2ca;hp=21cd19aa7bba2ad3ef4770832ceee3169696b68c;hpb=948617a6a0f129ba4090934ee8f544009dbcd935;p=timetracker.git
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 21cd19aa..e50d9a3e 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -27,6 +27,7 @@
// +----------------------------------------------------------------------+
import('ttConfigHelper');
+import('ttGroupHelper');
class ttUser {
var $login = null; // User login.
@@ -41,7 +42,8 @@ class ttUser {
var $behalf_id = null; // User id, on behalf of whom we are working.
var $behalf_group_id = null; // Group id, on behalf of which we are working.
var $behalf_name = null; // User name, on behalf of whom we are working.
- var $behalf_group = null; // Group name, on behalf of which we are working.
+ var $group_name = null; // Group name.
+ var $behalf_group_name = null;// Group name, on behalf of which we are working.
var $email = null; // User email.
var $lang = null; // Language.
var $decimal_mark = null; // Decimal separator.
@@ -63,7 +65,6 @@ class ttUser {
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 group.
var $lock_spec = null; // Cron specification for record locking.
var $workday_minutes = 480; // Number of work minutes in a regular day.
@@ -124,7 +125,7 @@ class ttUser {
$this->bcc_email = $val['bcc_email'];
$this->allow_ip = $val['allow_ip'];
$this->password_complexity = $val['password_complexity'];
- $this->group = $val['group_name'];
+ $this->group_name = $val['group_name'];
$this->currency = $val['currency'];
$this->plugins = $val['plugins'];
$this->lock_spec = $val['lock_spec'];
@@ -155,7 +156,7 @@ class ttUser {
// Set "on behalf" id and name (group).
if (isset($_SESSION['behalf_group_id'])) {
$this->behalf_group_id = $_SESSION['behalf_group_id'];
- $this->behalf_group = $_SESSION['behalf_group_name'];
+ $this->behalf_group_name = $_SESSION['behalf_group_name'];
}
}
}
@@ -192,10 +193,11 @@ class ttUser {
$result = array();
$mdb2 = getConnection();
+ $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
// 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.group_id = $this->group_id and p.status = 1 order by p.name";
+ where p.group_id = $group_id and p.status = 1 order by p.name";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
@@ -309,6 +311,7 @@ class ttUser {
$skipClients = !isset($options['include_clients']);
$includeSelf = isset($options['include_self']);
+ $group_id = isset($options['group_id']) ? $options['group_id'] : $this->group_id;
$select_part = 'select u.id, u.name';
if (isset($options['include_login'])) $select_part .= ', u.login';
@@ -321,7 +324,7 @@ class ttUser {
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.group_id = $this->group_id";
+ $where_part = " where u.org_id = $this->org_id and u.group_id = $group_id";
if (isset($options['status']))
$where_part .= ' and u.status = '.(int)$options['status'];
else
@@ -371,20 +374,20 @@ class ttUser {
$mdb2 = getConnection();
$selected_group_id = ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
- $selected_group_name = ($this->behalf_group_id ? $this->behalf_group : $this->group);
+ $selected_group_name = ($this->behalf_group_id ? $this->behalf_group_name : $this->group_name);
// Start with parent group.
- if ($selected_group_id != $this->org_id) {
- // We are in one of the subgroups, and a parent exists.
+ if ($selected_group_id != $this->group_id) {
+ // We are in one of subgroups, and a parent exists.
// Get parent group info.
- $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $selected_group_id";
+ $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $selected_group_id and status = 1";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
$parent_id = $val['parent_id'];
if ($parent_id) {
// Get parent group name.
- $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id";
+ $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id and status = 1";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
@@ -398,11 +401,29 @@ class ttUser {
$groups[] = array('id'=>$selected_group_id,'name'=>$selected_group_name);
// Add subgroups.
- $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $selected_group_id";
+ $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $selected_group_id and status = 1";
+ //die($sql);
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
- $groups[] = array('id'=>$val['id'],'name'=>$val['name']);
+ $groups[] = $val;
+ }
+ }
+ return $groups;
+ }
+
+ // getSubgroups obtains a list of immediate subgroups.
+ function getSubgroups($group_id = null) {
+ $mdb2 = getConnection();
+
+ if (!$group_id) $group_id = $this->getActiveGroup();
+
+ $sql = "select id, name, description from tt_groups where org_id = $this->org_id".
+ " and parent_id = $group_id and status is not null order by upper(name)";
+ $res = $mdb2->query($sql);
+ if (!is_a($res, 'PEAR_Error')) {
+ while ($val = $res->fetchRow()) {
+ $groups[] = $val;
}
}
return $groups;
@@ -428,13 +449,32 @@ class ttUser {
}
// checkBehalfId checks whether behalf_id is appropriate.
- // On behalf user must be active and have lower rank.
+ // On behalf user must be active and have lower rank if the user is from home group,
+ // otherwise:
+ // - subgroup must ve valid;
+ // - user should be a member of it.
function checkBehalfId() {
- $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
- $users = $this->getUsers($options);
- foreach($users as $one_user) {
- if ($one_user['id'] == $this->behalf_id)
- return true;
+ if (!$this->behalf_group_id) {
+ // Checking user from home group.
+ $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
+ $users = $this->getUsers($options);
+ foreach($users as $one_user) {
+ if ($one_user['id'] == $this->behalf_id)
+ return true;
+ }
+ } else {
+ // Checking user from a subgroup.
+ $group_id = $this->behalf_group_id;
+ if (!$this->isSubgroupValid($group_id))
+ return false;
+
+ // So far, so good. Check user now.
+ $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>MAX_RANK);
+ $users = $this->getUsers($options);
+ foreach($users as $one_user) {
+ if ($one_user['id'] == $this->behalf_id)
+ return true;
+ }
}
return false;
}
@@ -445,8 +485,13 @@ class ttUser {
// Needed for situations when user does not have do_own_something right.
// Example: has view_charts but does not have view_own_charts.
// In this case we still allow access to charts, but set behalf_id to someone else.
+ // Another example: working in a subgroup on behalf of someone else.
function adjustBehalfId() {
- $options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
+ $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
+ $rank = $this->getMaxRankForGroup($group_id);
+
+ // Adjust to first found user in group.
+ $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
$users = $this->getUsers($options);
foreach($users as $one_user) {
// Fake loop to access first element.
@@ -464,10 +509,16 @@ class ttUser {
if (!($this->can('manage_basic_settings') ||
$this->can('manage_advanced_settings') ||
$this->can('manage_features'))) return false;
+ // TODO: update the above for subgroup updates.
+
+ $group_id = $fields['group_id'];
+ if ($group_id && !$this->isGroupValid($group_id)) return false;
$mdb2 = getConnection();
+ if (!$group_id) $group_id = $this->getActiveGroup();
if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']);
+ if (isset($fields['description'])) $description_part = ', description = '.$mdb2->quote($fields['description']);
if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
if (isset($fields['lang'])) $lang_part = ', lang = '.$mdb2->quote($fields['lang']);
if (isset($fields['decimal_mark'])) $decimal_mark_part = ', decimal_mark = '.$mdb2->quote($fields['decimal_mark']);
@@ -488,11 +539,11 @@ class ttUser {
if (isset($fields['workday_minutes'])) $workday_minutes_part = ', workday_minutes = '.$mdb2->quote($fields['workday_minutes']);
$modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
- $parts = trim($name_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
+ $parts = trim($name_part.$description_part.$currency_part.$lang_part.$decimal_mark_part.$date_format_part.
$time_format_part.$week_start_part.$tracking_mode_part.$task_required_part.$project_required_part.$record_type_part.
$bcc_email_part.$allow_ip_part.$plugins_part.$config_part.$lock_spec_part.$workday_minutes_part.$modified_part, ',');
- $sql = "update tt_groups set $parts where id = $this->group_id";
+ $sql = "update tt_groups set $parts where id = $group_id and org_id = $this->org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
@@ -558,4 +609,100 @@ class ttUser {
return true;
}
+
+ // isGroupValid determines if a group is valid for user.
+ function isGroupValid($group_id) {
+ if ($group_id == $this->group_id)
+ return true;
+ else
+ return $this->isSubgroupValid($group_id);
+ }
+
+ // isSubgroupValid determines if a subgroup is valid for user.
+ // A subgroup is valid if:
+ // - user can manage_subgroups;
+ // - subgroup is either a direct child of user group, or "on the path"
+ // to it (grand-child, etc.).
+ function isSubgroupValid($subgroup_id) {
+ if (!$this->can('manage_subgroups')) return false; // User cannot manage subgroups.
+
+ $current_group_id = $subgroup_id;
+ while ($parent_group_id = ttGroupHelper::getParentGroup($current_group_id)) {
+ if ($parent_group_id == $this->group_id) {
+ return true; // Found it.
+ }
+ $current_group_id = $parent_group_id;
+ }
+ return false;
+ }
+
+ // getMaxRankForGroup determines effective user rank for a user in a given group.
+ // For home group it is the existing user rank (as per role) minus 1.
+ // For subgroups, if user can "manage_subgroups", it is MAX_RANK.
+ function getMaxRankForGroup($group_id) {
+
+ $max_rank = 0; // Start safely.
+ if ($this->group_id == $group_id) {
+ $max_rank = $this->rank - 1;
+ return $max_rank;
+ }
+
+ if ($this->isSubgroupValid($group_id))
+ $max_rank = MAX_RANK;
+
+ return $max_rank;
+ }
+
+ // getUserPartForHeader constructs a string for user to display on pages header.
+ // It changes with "on behalf" attributes for both user and group.
+ function getUserPartForHeader() {
+ global $i18n;
+ if (!$this->id) return null;
+
+ $user_part = htmlspecialchars($this->name);
+ $user_part .= ' - '.htmlspecialchars($this->role_name);
+ if ($this->behalf_id) {
+ $user_part .= ' '.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_name).'';
+ }
+ if ($this->behalf_group_id) {
+ $user_part .= ', '.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_group_name).'';
+ } else {
+ if ($this->group_name) // Note: we did not require group names in the past.
+ $user_part .= ', '.$this->group_name;
+ }
+ return $user_part;
+ }
+
+ // setOnBehalfGroup sets on behalf group for the user in both the object and the session.
+ function setOnBehalfGroup($group_id) {
+
+ // Unset things first.
+ $this->behalf_group_id = null;
+ $this->behalf_group_name = null;
+ unset($_SESSION['behalf_group_id']);
+ unset($_SESSION['behalf_group_name']);
+
+ // Do not do anything if we don't have rights.
+ if (!$this->can('manage_subgroups')) return;
+
+ // No need to set if the group is our home group.
+ if ($group_id == $this->group_id) return;
+
+ // No need to set if the subgroup is not valid.
+ if (!$this->isSubgroupValid($group_id)) return;
+
+ // We are good to set on behalf group.
+ $onBehalfGroupName = ttGroupHelper::getGroupName($group_id);
+ $_SESSION['behalf_group_id'] = $group_id;
+ $_SESSION['behalf_group_name'] = $onBehalfGroupName;
+ $this->behalf_group_id = $group_id;
+ $this->behalf_group_name = $onBehalfGroupName;
+
+ // Question remains whether or not we need to adjust on behalf user.
+ // Adjusting for now. Test it and redesign if necessary.
+ unset($_SESSION['behalf_id']);
+ unset($_SESSION['behalf_name']);
+ $this->adjustBehalfId();
+ return;
+ }
}