X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=time.php;h=258f15c19fd2a9b4d5bc6af9087b92665d522204;hb=a711e76851f29c7e0ac290a279eb4dd984ea7167;hp=d01744bf0b32c6bad0f7240eda746cd7513a6199;hpb=e96a91f4cdd1bd25ffab2afdc7d90102b30a37ba;p=timetracker.git
diff --git a/time.php b/time.php
index d01744bf..258f15c1 100644
--- a/time.php
+++ b/time.php
@@ -29,23 +29,26 @@
require_once('initialize.php');
import('form.Form');
import('ttUserHelper');
+import('ttGroupHelper');
import('ttTeamHelper');
import('ttClientHelper');
import('ttTimeHelper');
import('DateAndTime');
-// This is a now removed check whether user browser supports cookies.
-// if (!isset($_COOKIE['tt_PHPSESSID'])) {
- // This test gives a false-positive if user goes directly to this page
- // as from a desktop shortcut (on first request only).
- // die ("Your browser's cookie functionality is turned off. Please turn it on.");
-// }
-
-// Access check.
-if (!ttAccessAllowed('track_own_time')) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
header('Location: access_denied.php');
exit();
}
+if ($user->behalf_id && (!$user->can('track_time') || !$user->checkBehalfId())) {
+ header('Location: access_denied.php'); // Trying on behalf, but no right or wrong user.
+ exit();
+}
+if (!$user->behalf_id && !$user->can('track_own_time') && !$user->adjustBehalfId()) {
+ header('Location: access_denied.php'); // Trying as self, but no right for self, and noone to work on behalf.
+ exit();
+}
+// End of access checks.
// Initialize and store date in session.
$cl_date = $request->getParameter('date', @$_SESSION['date']);
@@ -59,7 +62,7 @@ $_SESSION['date'] = $cl_date;
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf')) {
require_once('plugins/CustomFields.class.php');
- $custom_fields = new CustomFields($user->team_id);
+ $custom_fields = new CustomFields($user->group_id);
$smarty->assign('custom_fields', $custom_fields);
}
@@ -93,6 +96,7 @@ if ($user->isPluginEnabled('iv')) {
$cl_billable = $_SESSION['billable'];
}
$on_behalf_id = $request->getParameter('onBehalfUser', (isset($_SESSION['behalf_id'])? $_SESSION['behalf_id'] : $user->id));
+$on_behalf_group_id = $request->getParameter('onBehalfGroup', (isset($_SESSION['behalf_group_id'])? $_SESSION['behalf_group_id'] : $user->group_id));
$cl_client = $request->getParameter('client', ($request->isPost() ? null : @$_SESSION['client']));
$_SESSION['client'] = $cl_client;
$cl_project = $request->getParameter('project', ($request->isPost() ? null : @$_SESSION['project']));
@@ -103,9 +107,30 @@ $_SESSION['task'] = $cl_task;
// Elements of timeRecordForm.
$form = new Form('timeRecordForm');
-if ($user->canManageTeam()) {
- $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));
- if (count($user_list) > 1) {
+if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
+if ($user->can('manage_subgroups')) {
+ $groups = $user->getGroups();
+ if (count($groups) > 1) {
+ $form->addInput(array('type'=>'combobox',
+ 'onchange'=>'this.form.submit();',
+ 'name'=>'onBehalfGroup',
+ 'style'=>'width: 250px;',
+ 'value'=>$on_behalf_group_id,
+ 'data'=>$groups,
+ 'datakeys'=>array('id','name')));
+ $smarty->assign('on_behalf_group_control', 1);
+ }
+}
+} // SUBGROUP_DEBUG
+
+if ($user->can('track_time')) {
+ $rank = $user->getMaxRankForGroup($on_behalf_group_id);
+ if ($user->can('track_own_time'))
+ $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$rank,'include_self'=>true,'self_first'=>true);
+ else
+ $options = array('group_id'=>$on_behalf_group_id,'status'=>ACTIVE,'max_rank'=>$rank);
+ $user_list = $user->getUsers($options);
+ if (count($user_list) >= 1) {
$form->addInput(array('type'=>'combobox',
'onchange'=>'this.form.submit();',
'name'=>'onBehalfUser',
@@ -119,7 +144,7 @@ if ($user->canManageTeam()) {
// Dropdown for clients in MODE_TIME. Use all active clients.
if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
- $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+ $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
'name'=>'client',
@@ -127,7 +152,7 @@ if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
'value'=>$cl_client,
'data'=>$active_clients,
'datakeys'=>array('id', 'name'),
- 'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.select'))));
// Note: in other modes the client list is filtered to relevant clients only. See below.
}
@@ -141,11 +166,11 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
'value'=>$cl_project,
'data'=>$project_list,
'datakeys'=>array('id','name'),
- 'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.select'))));
// Dropdown for clients if the clients plugin is enabled.
if ($user->isPluginEnabled('cl')) {
- $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+ $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
// We need an array of assigned project ids to do some trimming.
foreach($project_list as $project)
$projects_assigned_to_user[] = $project['id'];
@@ -168,26 +193,26 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
'value'=>$cl_client,
'data'=>$client_list,
'datakeys'=>array('id', 'name'),
- 'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.select'))));
}
}
if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
- $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+ $task_list = ttTeamHelper::getActiveTasks($user->group_id);
$form->addInput(array('type'=>'combobox',
'name'=>'task',
'style'=>'width: 250px;',
'value'=>$cl_task,
'data'=>$task_list,
'datakeys'=>array('id','name'),
- 'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.select'))));
}
// Add other controls.
if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
$form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
$form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
- if ($user->punch_mode && !$user->can('override_punch_mode')) {
+ if ($user->punch_mode && !$user->canOverridePunchMode()) {
// Make the start and finish fields read-only.
$form->getElement('start')->setEnabled(false);
$form->getElement('finish')->setEnabled(false);
@@ -202,7 +227,7 @@ $form->addInput(array('type'=>'calendar','name'=>'date','value'=>$cl_date)); //
if ($user->isPluginEnabled('iv'))
$form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
$form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_submit click.
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('button.submit')));
// If we have custom fields - add controls for them.
if ($custom_fields && $custom_fields->fields[0]) {
@@ -214,7 +239,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
'style'=>'width: 250px;',
'value'=>$cl_cf_1,
'data'=>$custom_fields->options,
- 'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.select'))));
}
}
@@ -224,62 +249,62 @@ if ($request->isPost()) {
// Validate user input.
if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
- $err->add($i18n->getKey('error.client'));
+ $err->add($i18n->get('error.client'));
if ($custom_fields) {
- if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+ if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
}
if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
- if (!$cl_project) $err->add($i18n->getKey('error.project'));
+ if (!$cl_project) $err->add($i18n->get('error.project'));
}
if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
- if (!$cl_task) $err->add($i18n->getKey('error.task'));
+ if (!$cl_task) $err->add($i18n->get('error.task'));
}
if (strlen($cl_duration) == 0) {
if ($cl_start || $cl_finish) {
if (!ttTimeHelper::isValidTime($cl_start))
- $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+ $err->add($i18n->get('error.field'), $i18n->get('label.start'));
if ($cl_finish) {
if (!ttTimeHelper::isValidTime($cl_finish))
- $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+ $err->add($i18n->get('error.field'), $i18n->get('label.finish'));
if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
- $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+ $err->add($i18n->get('error.interval'), $i18n->get('label.finish'), $i18n->get('label.start'));
}
} else {
if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
- $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
- $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+ $err->add($i18n->get('error.empty'), $i18n->get('label.start'));
+ $err->add($i18n->get('error.empty'), $i18n->get('label.finish'));
}
if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
- $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+ $err->add($i18n->get('error.empty'), $i18n->get('label.duration'));
}
} else {
if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
- $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+ $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
}
- if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+ if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
// Finished validating user input.
// Prohibit creating entries in future.
if (!$user->future_entries) {
$browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
if ($selected_date->after($browser_today))
- $err->add($i18n->getKey('error.future_date'));
+ $err->add($i18n->get('error.future_date'));
}
// Prohibit creating entries in locked range.
if ($user->isDateLocked($selected_date))
- $err->add($i18n->getKey('error.range_locked'));
+ $err->add($i18n->get('error.range_locked'));
// Prohibit creating another uncompleted record.
if ($err->no()) {
if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == '')))
- $err->add($i18n->getKey('error.uncompleted_exists')." ".$i18n->getKey('error.goto_uncompleted')."");
+ $err->add($i18n->get('error.uncompleted_exists')." ".$i18n->get('error.goto_uncompleted')."");
}
// Prohibit creating an overlapping record.
if ($err->no()) {
if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
- $err->add($i18n->getKey('error.overlap'));
+ $err->add($i18n->get('error.overlap'));
}
// Insert record.
@@ -287,6 +312,7 @@ if ($request->isPost()) {
$id = ttTimeHelper::insert(array(
'date' => $cl_date,
'user_id' => $user->getActiveUser(),
+ 'group_id' => $user->getActiveGroup(),
'client' => $cl_client,
'project' => $cl_project,
'task' => $cl_task,
@@ -308,7 +334,7 @@ if ($request->isPost()) {
header('Location: time.php');
exit();
}
- $err->add($i18n->getKey('error.db'));
+ $err->add($i18n->get('error.db'));
}
} elseif ($request->getParameter('btn_stop')) {
// Stop button pressed to finish an uncompleted record.
@@ -333,25 +359,68 @@ if ($request->isPost()) {
'note'=>$record['comment'],
'billable'=>$record['billable']));
if (!$res)
- $err->add($i18n->getKey('error.db'));
+ $err->add($i18n->get('error.db'));
} else {
// Cannot complete, redirect for manual edit.
header('Location: time_edit.php?id='.$record_id);
exit();
}
}
- elseif ($request->getParameter('onBehalfUser')) {
- if($user->canManageTeam()) {
- 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);
+ elseif ($request->getParameter('onBehalfUser') || $request->getParameter('onBehalfGroup')) {
+ // User changed either on behalf user or group.
+ // TODO: Organize this code into a separate function.
+
+ // We get here if one of the dropdowns changed. Handle these 2 situations differently.
+ // 1) User changed. Determine if user changed. Then do exactly as before.
+ //
+ // Group changed. Determine if group changed.
+ // Adjust group info.
+ // Adjust user info to first user in group (or self if we are in home group now).
+ //
+ // Determine if user was changed.
+ if ($request->getParameter('onBehalfUser')) {
+ $request_user_id = $request->getParameter('onBehalfUser');
+ $session_user_id = $_SESSION['behalf_id'];
+ $user_changed = !(($session_user_id == null && ($user->id == $request_user_id))
+ || ($session_user_id != null && ($request_user_id == $session_user_id)));
+ if ($user_changed && $user->can('track_time')) {
+ unset($_SESSION['behalf_id']);
+ unset($_SESSION['behalf_name']);
+
+ if($request_user_id != $user->id) {
+ $_SESSION['behalf_id'] = $request_user_id;
+ $_SESSION['behalf_name'] = ttUserHelper::getUserName($request_user_id);
+ }
+ }
+ }
+
+ if ($request->getParameter('onBehalfGroup')) {
+ // Determine if group was changed.
+ $request_group_id = $request->getParameter('onBehalfGroup');
+ $session_group_id = $_SESSION['behalf_group_id'];
+ $group_changed = !(($session_group_id == null && ($user->group_id == $request_group_id))
+ || ($session_group_id != null && ($request_group_id == $session_group_id)));
+
+ if ($group_changed && $user->can('manage_subgroups')) {
+ unset($_SESSION['behalf_group_id']);
+ unset($_SESSION['behalf_group_name']);
+ if ($request_group_id == $user->group_id)
+ $user->behalf_group_id = null;
+
+ if (($request_group_id != $user->group_id) && $user->isSubgroupValid($request_group_id)) {
+ $_SESSION['behalf_group_id'] = $request_group_id;
+ $_SESSION['behalf_group_name'] = ttGroupHelper::getGroupName($request_group_id);
+ $user->behalf_group_id = $request_group_id;
+ }
+
+ unset($_SESSION['behalf_id']);
+ unset($_SESSION['behalf_name']);
+ if ($request_group_id != $user->group_id)
+ $user->adjustBehalfId();
}
- header('Location: time.php');
- exit();
}
+ header('Location: time.php');
+ exit();
}
} // isPost
@@ -367,6 +436,6 @@ $smarty->assign('task_list', $task_list);
$smarty->assign('forms', array($form->getName()=>$form->toArray()));
$smarty->assign('onload', 'onLoad="fillDropdowns()"');
$smarty->assign('timestring', $selected_date->toString($user->date_format));
-$smarty->assign('title', $i18n->getKey('title.time'));
+$smarty->assign('title', $i18n->get('title.time'));
$smarty->assign('content_page_name', 'time.tpl');
$smarty->display('index.tpl');