X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=initialize.php;h=5dcd6fffde274cb27359f164c10df1a6055a9c11;hb=813f43a9406fb5adfb8c6e89cd97b06a11da58c9;hp=c9a4245861ca975b6ccff144dbaf144634a44928;hpb=155381237a76f93a5a84999082261d3728232ea2;p=timetracker.git

diff --git a/initialize.php b/initialize.php
index c9a42458..5dcd6fff 100644
--- a/initialize.php
+++ b/initialize.php
@@ -74,7 +74,6 @@ $smarty = new Smarty;
 $smarty->use_sub_dirs = false;
 $smarty->template_dir = TEMPLATE_DIR;
 $smarty->compile_dir  = TEMPLATE_DIR.'_c';
-$GLOBALS['SMARTY'] = &$smarty;
 
 // Note: these 3 settings below used to be in .htaccess file. Moved them here to eliminate "error 500" problems
 // with some shared hostings that do not have AllowOverride Options or AllowOverride All in their apache configurations.
@@ -126,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.
@@ -197,9 +198,13 @@ if (!$lang) {
 
 // Load i18n file.
 $i18n->load($lang);
-$GLOBALS['I18N'] = &$i18n;
 
-$GLOBALS['USER'] = &$user;
+// Temporary code to assign role_id to users who don't yet have it.
+if ($user->login && !$user->role_id) {
+  $user->migrateLegacyRole(); // Note: this requires initialized $i18n.
+  // Recycle User object, now with proper role_id.
+  $user = new ttUser(null, $auth->getUserId());
+}
 
 // Assign things for smarty to use in template files.
 $smarty->assign('i18n', $i18n->keys);