X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/ca6d2f927b985f4d80b31e5e2c6deb98e4fae6f6..52efa3cc9f8ad94f363f41cc2bca472b6492268d:/WEB-INF/lib/ttUser.class.php diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index ccd1f961..968a1f10 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -166,16 +166,41 @@ class ttUser { } } + // The getGroup returns group id on behalf of which the current user is operating. + function getGroup() { + return ($this->behalfGroup ? $this->behalfGroup->id : $this->group_id); + } + + // getDecimalMark returns decimal mark for active group. + function getDecimalMark() { + return ($this->behalfGroup ? $this->behalfGroup->decimal_mark : $this->decimal_mark); + } + + // getTrackingMode returns tracking mode for active group. + function getTrackingMode() { + return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode); + } + + // getRecordType returns record type for active group. + function getRecordType() { + return ($this->behalfGroup ? $this->behalfGroup->record_type : $this->record_type); + } + + // getPlugins returns plugins string for active group. + function getPlugins() { + return ($this->behalfGroup ? $this->behalfGroup->plugins : $this->plugins); + } + + // getConfig returns config string for active group. + function getConfig() { + return ($this->behalfGroup ? $this->behalfGroup->config : $this->config); + } + // 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); } - // The getActiveGroup returns group id on behalf of which the current user is operating. - function getActiveGroup() { - return ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id); - } - // can - determines whether user has a right to do something. function can($do_something) { return in_array($do_something, $this->rights); @@ -189,7 +214,7 @@ class ttUser { // isPluginEnabled checks whether a plugin is enabled for user. function isPluginEnabled($plugin) { - return in_array($plugin, explode(',', $this->plugins)); + return in_array($plugin, explode(',', $this->getPlugins())); } // getAssignedProjects - returns an array of assigned projects. @@ -313,7 +338,7 @@ class ttUser { function getUsers($options) { $mdb2 = getConnection(); - $group_id = $this->getActiveGroup(); + $group_id = $this->getGroup(); $org_id = $this->org_id; $skipClients = !isset($options['include_clients']); @@ -378,12 +403,27 @@ class ttUser { // - The entire stack of groups all the way down to current on behalf group. // - All immediate children of the current on behalf group. // This allows user to navigate easily to home group, anything in between, and 1 level below. + // + // Note 1: group dropdown is, by design, to be placed on all pages where "relevant", + // such as users.php, projects.php, tasks.php, etc. But some features may be disabled + // in some groups. We should check for feature availability on group change + // in post and redirect to feature_disabled.php when this happens. + // This will allow us to keep dropdown content consistent on all pages. + // Filtering content of the dropdown does not seem right. + // + // Note 2: Menu should display according to $user home group settings. + // Pages, should look according to $user->behalfGroup settings (if set). + // For example, if home group allows tasks, menu should display Tasks, + // even when we are on behalf of a subgroup without tasks. + // + // Note 3: Language of all pages should be as in $user home group even when + // subgroups have a different language. function getGroupsForDropdown() { $mdb2 = getConnection(); // Start with subgroups. $groups = array(); - $group_id = $this->getActiveGroup(); + $group_id = $this->getGroup(); $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $group_id and status = 1"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { @@ -426,7 +466,7 @@ class ttUser { function getSubgroups($group_id = null) { $mdb2 = getConnection(); - if (!$group_id) $group_id = $this->getActiveGroup(); + if (!$group_id) $group_id = $this->getGroup(); $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)"; @@ -445,7 +485,7 @@ class ttUser { if (!$this->can('manage_users')) return false; $mdb2 = getConnection(); - $group_id = $this->getActiveGroup(); + $group_id = $this->getGroup(); $org_id = $this->org_id; $sql = "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u". @@ -527,7 +567,7 @@ class ttUser { if ($group_id && !$this->isGroupValid($group_id)) return false; $mdb2 = getConnection(); - if (!$group_id) $group_id = $this->getActiveGroup(); + if (!$group_id) $group_id = $this->getGroup(); if (isset($fields['name'])) $name_part = ', name = '.$mdb2->quote($fields['name']); if (isset($fields['description'])) $description_part = ', description = '.$mdb2->quote($fields['description']); @@ -572,7 +612,7 @@ class ttUser { if (!$user_details) return false; $mdb2 = getConnection(); - $group_id = $this->getActiveGroup(); + $group_id = $this->getGroup(); $org_id = $this->org_id; // Mark user to project binds as deleted. @@ -627,6 +667,20 @@ class ttUser { return true; } + // isUserValid determines if a user is valid for on behalf work. + function isUserValid($user_id) { + if ($user_id == $this->id) + return true; + + $user_details = $this->getUser($user_id); // TODO: this will probably not work for higher ranks. + // In this case we'll need another function. + // Or adjust getUser for max rank. + if (!$user_details) + return false; + + return true; + } + // isGroupValid determines if a group is valid for user. function isGroupValid($group_id) { if ($group_id == $this->group_id) @@ -698,6 +752,7 @@ class ttUser { $this->behalf_group_name = null; $this->behalf_id = null; $this->behalf_name = null; + unset($this->behalfGroup); unset($_SESSION['behalf_group_id']); unset($_SESSION['behalf_group_name']); unset($_SESSION['behalf_id']); @@ -706,10 +761,10 @@ class ttUser { // 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. + // No need to set if group is our home group. if ($group_id == $this->group_id) return; - // No need to set if the subgroup is not valid. + // No need to set if subgroup is not valid. if (!$this->isSubgroupValid($group_id)) return; // We are good to set on behalf group. @@ -719,11 +774,34 @@ class ttUser { $this->behalf_group_id = $group_id; $this->behalf_group_name = $onBehalfGroupName; - unset($this->behalfGroup); $this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id); // Adjust on behalf user. $this->adjustBehalfId(); return; } + + // setOnBehalfUser sets on behalf user both the object and the session. + function setOnBehalfUser($user_id) { + + // Unset things first. + $this->behalf_id = null; + $this->behalf_name = null; + unset($_SESSION['behalf_id']); + unset($_SESSION['behalf_name']); + + // No need to set if user is us. + if ($user_id == $this->id) return; + + // No need to set if user id is not valid. + if (!$this->isUserValid($user_id)) return; + + // We are good to set on behalf user. + $onBehalfUserName = ttUserHelper::getUserName($user_id); + $_SESSION['behalf_id'] = $user_id; + $_SESSION['behalf_name'] = $onBehalfUserName; + $this->behalf_id = $user_id; + $this->behalf_name = $onBehalfUserName; + return; + } }