// - subgroup must ve valid;
// - user should be a member of it.
function checkBehalfId() {
- if (!$this->behalf_group_id) {
+ if (!$this->behalfGroup) {
// Checking user from home group.
$options = array('status'=>ACTIVE,'max_rank'=>$this->rank-1);
$users = $this->getUsers($options);
}
} else {
// Checking user from a subgroup.
- $group_id = $this->behalf_group_id;
+ $group_id = $this->behalfGroup->id;
if (!$this->isSubgroupValid($group_id))
return false;
// 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() {
- $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
- $rank = $this->getMaxRankForGroup($group_id);
+ $rank = $this->getMaxRankForGroup($this->getGroup());
// Adjust to first found user in group.
- $options = array('group_id'=>$group_id,'status'=>ACTIVE,'max_rank'=>$rank);
+ $options = array('status'=>ACTIVE,'max_rank'=>$rank);
$users = $this->getUsers($options);
foreach($users as $one_user) {
// Fake loop to access first element.
$this->behalfGroup = new ttGroup($this->behalf_group_id, $this->org_id);
- // Adjust on behalf user.
+ // Adjust on behalf user to first found user in subgroup.
$this->adjustBehalfId();
return;
}
header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to view on behalf.
exit();
}
+if ($request->isPost() && $request->getParameter('user')) {
+ if (!$user->isUserValid($request->getParameter('user'))) {
+ header('Location: access_denied.php'); // Wrong user id on post.
+ exit();
+ }
+}
+// End of access checks.
+
+// Determine user for which we display this page.
+$userChanged = $request->getParameter('user_changed');
+if ($request->isPost() && $userChanged) {
+ $user_id = $request->getParameter('user');
+ $user->setOnBehalfUser($user_id);
+} else {
+ $user_id = $user->getUser();
+ // Handle a situation for no users in on behalf group.
+ if ($user->behalfGroup && $user_id == $user->id)
+ $user_id = null;
+}
+
+$uc = new ttUserConfig();
+$tracking_mode = $user->getTrackingMode();
// Initialize and store date in session.
$cl_date = $request->getParameter('date', @$_SESSION['date']);
}
$_SESSION['date'] = $cl_date;
-// Initialize chart interval.
-$cl_interval = $_SESSION['chart_interval'];
-if (!$cl_interval) {
- $uc = new ttUserConfig();
- $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
-}
-if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
-$_SESSION['chart_interval'] = $cl_interval;
-
-// Initialize chart type.
-$cl_type = $_SESSION['chart_type'];
-if (!$cl_type) {
- $uc = new ttUserConfig();
- $cl_type = $uc->getValue(SYSC_CHART_TYPE);
-}
-if (MODE_TIME == $user->getTrackingMode()) {
- if ($user->isPluginEnabled('cl'))
- $cl_type = CHART_CLIENTS;
-} else {
- if ($cl_type == CHART_CLIENTS) {
- if (!$user->isPluginEnabled('cl'))
- $cl_type = CHART_PROJECTS;
- } elseif ($cl_type == CHART_TASKS) {
- if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode())
- $cl_type = CHART_PROJECTS;
- }
-}
-if (!$cl_type) $cl_type = CHART_PROJECTS;
-$_SESSION['chart_type'] = $cl_type;
-
-// Who do we draw charts for?
-$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
-
if ($request->isPost()) {
- // If chart interval changed - save it.
$cl_interval = $request->getParameter('interval');
- if ($cl_interval) {
- // Save in the session
- $_SESSION['chart_interval'] = $cl_interval;
- // and permanently.
- $uc = new ttUserConfig();
- $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
- }
- // If chart type changed - save it.
+ if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
+ $_SESSION['chart_interval'] = $cl_interval;
+ $uc->setValue(SYSC_CHART_INTERVAL, $cl_interval);
+
$cl_type = $request->getParameter('type');
- if ($cl_type) {
- // Save in the session
- $_SESSION['chart_type'] = $cl_type;
- // and permanently.
- $uc = new ttUserConfig();
- $uc->setValue(SYSC_CHART_TYPE, $cl_type);
- }
- // If user has changed - set behalf_id accordingly in the session.
- if ($request->getParameter('onBehalfUser')) {
- if($user->can('view_charts')) {
- unset($_SESSION['behalf_id']);
- unset($_SESSION['behalf_name']);
-
- if($on_behalf_id != $user->id) {
- $_SESSION['behalf_id'] = $on_behalf_id;
- $_SESSION['behalf_name'] = ttUserHelper::getUserName($on_behalf_id);
- }
- header('Location: charts.php');
- exit();
- }
- }
-} // isPost
+ if (!$cl_type) $cl_type = ttChartHelper::adjustType($cl_type);
+ $_SESSION['chart_type'] = $cl_type;
+ $uc->setValue(SYSC_CHART_TYPE, $cl_type);
+} else {
+ // Initialize chart interval.
+ $cl_interval = $_SESSION['chart_interval'];
+ if (!$cl_interval) $cl_interval = $uc->getValue(SYSC_CHART_INTERVAL);
+ if (!$cl_interval) $cl_interval = INTERVAL_THIS_MONTH;
+ $_SESSION['chart_interval'] = $cl_interval;
+
+ // Initialize chart type.
+ $cl_type = $_SESSION['chart_type'];
+ if (!$cl_type) $cl_type = $uc->getValue(SYSC_CHART_TYPE);
+ $cl_type = ttChartHelper::adjustType($cl_type);
+ $_SESSION['chart_type'] = $cl_type;
+}
// Elements of chartForm.
$chart_form = new Form('chartForm');
$user_list = $user->getUsers($options);
if (count($user_list) >= 1) {
$chart_form->addInput(array('type'=>'combobox',
- 'onchange'=>'this.form.submit();',
- 'name'=>'onBehalfUser',
- 'value'=>$on_behalf_id,
+ 'onchange'=>'this.form.user_changed.value=1;this.form.submit();',
+ 'name'=>'user',
+ 'value'=>$user_id,
'data'=>$user_list,
'datakeys'=>array('id','name'),
));
- $smarty->assign('on_behalf_control', 1);
+ $chart_form->addInput(array('type'=>'hidden','name'=>'user_changed'));
+ $smarty->assign('user_dropdown', 1);
}
}
// Chart interval dropdown.
$chart_form->addInput(array('type' => 'combobox',
- 'onchange' => 'if(this.form) this.form.submit();',
+ 'onchange' => 'this.form.submit();',
'name' => 'interval',
'value' => $cl_interval,
'data' => $intervals
));
// Chart type options.
-$chart_selector = (MODE_PROJECTS_AND_TASKS == $user->tracking_mode || $user->isPluginEnabled('cl'));
+$chart_selector = (MODE_PROJECTS_AND_TASKS == $tracking_mode || $user->isPluginEnabled('cl'));
if ($chart_selector) {
$types = array();
- if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+ if (MODE_PROJECTS == $tracking_mode || MODE_PROJECTS_AND_TASKS == $tracking_mode)
$types[CHART_PROJECTS] = $i18n->get('dropdown.projects');
- if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+ if (MODE_PROJECTS_AND_TASKS == $tracking_mode)
$types[CHART_TASKS] = $i18n->get('dropdown.tasks');
if ($user->isPluginEnabled('cl'))
$types[CHART_CLIENTS] = $i18n->get('dropdown.clients');
// Add chart type dropdown.
$chart_form->addInput(array('type' => 'combobox',
- 'onchange' => 'if(this.form) this.form.submit();',
+ 'onchange' => 'this.form.submit();',
'name' => 'type',
'value' => $cl_type,
'data' => $types
$chart_form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); // calendar
// Get data for our chart.
-$totals = ttChartHelper::getTotals($on_behalf_id, $cl_type, $cl_date, $cl_interval);
+$totals = ttChartHelper::getTotals($user_id, $cl_type, $cl_date, $cl_interval);
$smarty->assign('totals', $totals);
// Prepare chart for drawing.
projects / timetracker.git / commitdiff