From: Nik Okuntseff Date: Sat, 7 Apr 2018 10:47:24 +0000 (+0000) Subject: Cleanup. X-Git-Tag: timetracker_1.19-1~862 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b0adefe1eed972a27be939b6c66aec6c3c6b2f18;p=timetracker.git Cleanup. --- diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index dfcd1a6b..2fb7caa1 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -148,7 +148,7 @@ class ttUser { return in_array($do_something, $this->rights); } - // isAdmin - determines whether current user is admin (has right_administer_site). + // isAdmin - determines whether current user is admin. function isAdmin() { return $this->can('administer_site'); } diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index a47ecc9e..86c58ed2 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.87.4239 | Copyright © Anuko | +  Anuko Time Tracker 1.17.87.4240 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/initialize.php b/initialize.php index 261ec747..79540850 100644 --- a/initialize.php +++ b/initialize.php @@ -125,31 +125,6 @@ define('TYPE_ALL', 0); // Time record can be specified with either duration or s define('TYPE_START_FINISH', 1); // Time record has start and finish times. define('TYPE_DURATION', 2); // Time record has only duration, no start and finish times. -// TODO: redesign of user rights and roles is currently ongoing. -// As we run our of bits for sure at some point, rights should be strings instead, -// for example: "data_entry". -// Also, we need rights editor page and team-customized roles. -// Move this stuff from here to ttUser class. -// -// User access rights - bits that collectively define an access mask to the system (a role). -// We'll have some bits here (1,2, etc...) reserved for future use. -define('right_data_entry', 4); // Right to enter work hours and expenses. -define('right_view_charts', 8); // Right to view charts. -define('right_view_reports', 16); // Right to view reports. -define('right_view_invoices', 32); // Right to view invoices. -define('right_manage_team', 64); // Right to manage team. Note that this is not full access to team. -define('right_assign_roles', 128); // Right to assign user roles. -define('right_export_team', 256); // Right to export team data to a file. -define('right_administer_site', 1024); // Admin account right to manage the application as a whole. - -// User roles. -define('ROLE_USER', 4); // Regular user. -define('ROLE_CLIENT', 16); // Client (to view reports and invoices). -define('ROLE_COMANAGER', 68); // Team co-manager. Can do many things but not as much as team manager. -define('ROLE_MANAGER', 324); // Team manager. Can do everything for a team. -define('ROLE_SITE_ADMIN', 1024); // Site administrator. - - define('CHARSET', 'utf-8'); date_default_timezone_set(@date_default_timezone_get());