From f16c4f8b2a5b9b196fdfe46f329e54c89a861f7b Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Fri, 16 Mar 2018 18:41:32 +0000 Subject: [PATCH] Introduced override_own_punch_mode right. --- WEB-INF/lib/ttUser.class.php | 12 ++++++++++++ WEB-INF/templates/footer.tpl | 2 +- dbinstall.php | 11 ++++++++++- mobile/time.php | 3 +-- mobile/time_edit.php | 3 +-- mysql.sql | 4 ++-- time.php | 3 +-- time_edit.php | 3 +-- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index f7b62344..0d62749b 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -223,4 +223,16 @@ class ttUser { } return false; } + + // canOverridePunchMode checks whether a user can override punch mode in a situation. + function canOverridePunchMode() + { + if (!$this->behalf_id && !$this->can('override_own_punch_mode')) + return false; // User is working as self and cannot override for self. + + if ($this->behalf_id && !$this->can('override_punch_mode')) + return false; // User is working on behalf of someone else and cannot override. + + return true; + } } diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index a4aaed7d..d5e05352 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- + + + +
 Anuko Time Tracker 1.17.47.4086 | Copyright © Anuko | +  Anuko Time Tracker 1.17.48.4087 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index 8dfe1bf1..5fec589e 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -805,6 +805,11 @@ if ($_POST) { print "Updated $users_updated users...
\n"; } + if ($_POST["convert11744to11748"]) { + setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'"); + } + if ($_POST["cleanup"]) { $mdb2 = getConnection(); @@ -848,7 +853,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.17.44) + Create database structure (v1.17.48)
(applies only to new installations, do not execute when updating)
@@ -887,6 +892,10 @@ if ($_POST) { 		Update database structure (v1.14 to v1.17.44)
Update database structure (v1.17.44 to v1.17.48)

DB Maintenance

diff --git a/mobile/time.php b/mobile/time.php index 5cffc047..fc1f68ff 100644 --- a/mobile/time.php +++ b/mobile/time.php @@ -155,8 +155,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { 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 && // Punch mode enabled for team. - !($user->behalf_id && $user->can('override_punch_mode'))) { // Cannot override for lower roles. + if ($user->punch_mode && !$user->canOverridePunchMode()) { // Make the start and finish fields read-only. $form->getElement('start')->setEnabled(false); $form->getElement('finish')->setEnabled(false); diff --git a/mobile/time_edit.php b/mobile/time_edit.php index c47515b6..6ec41def 100644 --- a/mobile/time_edit.php +++ b/mobile/time_edit.php @@ -175,8 +175,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { 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 && // Punch mode enabled for team. - !($user->behalf_id && $user->can('override_punch_mode'))) { // Cannot override for lower roles. + if ($user->punch_mode && !$user->canOverridePunchMode()) { // Make the start and finish fields read-only. $form->getElement('start')->setEnabled(false); $form->getElement('finish')->setEnabled(false); diff --git a/mysql.sql b/mysql.sql index 56f52d8b..a4fa84c8 100644 --- a/mysql.sql +++ b/mysql.sql @@ -66,7 +66,7 @@ create unique index role_idx on tt_roles(team_id, rank, status); # Insert site-wide roles - site administrator and top manager. INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site'); -INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups'); +INSERT INTO `tt_roles` (`team_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_invoices,manage_own_settings,view_users,track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_own_punch_mode,override_date_lock,swap_roles,approve_timesheets,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups'); # @@ -427,4 +427,4 @@ CREATE TABLE `tt_site_config` ( PRIMARY KEY (`param_name`) ); -INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.44', now()); # TODO: change when structure changes. +INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.48', now()); # TODO: change when structure changes. diff --git a/time.php b/time.php index 6f860fd0..7f9b1849 100644 --- a/time.php +++ b/time.php @@ -187,8 +187,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { 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 && // Punch mode enabled for team. - !($user->behalf_id && $user->can('override_punch_mode'))) { // Cannot override for lower roles. + if ($user->punch_mode && !$user->canOverridePunchMode()) { // Make the start and finish fields read-only. $form->getElement('start')->setEnabled(false); $form->getElement('finish')->setEnabled(false); diff --git a/time_edit.php b/time_edit.php index 1ff3ad8d..59ae7531 100644 --- a/time_edit.php +++ b/time_edit.php @@ -178,8 +178,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { 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 && // Punch mode enabled for team. - !($user->behalf_id && $user->can('override_punch_mode'))) { // Cannot override for lower roles. + if ($user->punch_mode && !$user->canOverridePunchMode()) { // Make the start and finish fields read-only. $form->getElement('start')->setEnabled(false); $form->getElement('finish')->setEnabled(false); -- 2.20.1