Rollback of role upgrade as something apparently not working.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 84441b4830d71883380147b3c58a4b08d59af514..d04ee534f28d657bb5f62ddd2d4abf9e7bb8512a 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.17.37.4054 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.38.4055 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/initialize.php b/initialize.php
index 63ed88d5cdfef6a565353c066fa81ae40ab20459..53342b686955afdf7e569ad9eed42eebfe879984 100644 (file)
--- a/initialize.php
+++ b/initialize.php
@@ -170,11 +170,12 @@ $msg = new ActionErrors(); // Notification messages (not errrors) for user.
 import('ttUser');
 $user = new ttUser(null, $auth->getUserId());
 // Temporary code to assign role_id to users who don't yet have it.
 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->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');
 if ($user->custom_logo) {
   $smarty->assign('custom_logo', 'images/'.$user->team_id.'.png');
   $smarty->assign('mobile_custom_logo', '../images/'.$user->team_id.'.png');