X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/7341c172b0754194233c787f14f2cde95c75205d..585e3677a73f80cadd664572e3863fc38e4d8633:/initialize.php

diff --git a/initialize.php b/initialize.php
index c1a8437a..53342b68 100644
--- a/initialize.php
+++ b/initialize.php
@@ -125,10 +125,12 @@ 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.
 
-// Definitions for uncompleted time entry indicators.
-define('UNCOMPLETED_INDICATORS_NONE', 0); // Do not show indicators.
-define('UNCOMPLETED_INDICATORS', 1); // Show indicators.
-
+// 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.
@@ -167,6 +169,13 @@ $msg = new ActionErrors(); // Notification messages (not errrors) for user.
 // Create an instance of ttUser class. This gets us most of user details.
 import('ttUser');
 $user = new ttUser(null, $auth->getUserId());
+// Temporary code to assign role_id to users who don't yet have it.
+/*
+if ($user->login && !$user->role_id) {
+  $user->migrateLegacyRole();
+  // Recycle User object, now with proper role_id.
+  $user = new ttUser(null, $auth->getUserId());
+}*/
 if ($user->custom_logo) {
   $smarty->assign('custom_logo', 'images/'.$user->team_id.'.png');
   $smarty->assign('mobile_custom_logo', '../images/'.$user->team_id.'.png');