Fixed a redirect for different user roles after password change.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d41742401fe48e9dd2d82332d6006223bd183a69..eeab7899b2648f45697e58726a6ce2ed5dccb210 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.9.19.3441 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.19.3442 | 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/login.php b/login.php
index 19b88eacc437003aac91c631e2192d153b0ea948..7f55853aec94360ecd2a2f72e8d5d079b007ac91 100644 (file)
--- a/login.php
+++ b/login.php
@@ -65,16 +65,14 @@ if ($request->isPost()) {
       // Redirect, depending on user role.
       if ($user->isAdmin()) {
         header('Location: admin_teams.php');
       // Redirect, depending on user role.
       if ($user->isAdmin()) {
         header('Location: admin_teams.php');

-        exit();

       }
       else if ($user->isClient()) {
         header('Location: reports.php');
       }
       else if ($user->isClient()) {
         header('Location: reports.php');

-        exit();

       }
       else {
         header('Location: time.php');
       }
       else {
         header('Location: time.php');

-        exit();

       }
       }

+      exit();

     } else
       $err->add($i18n->getKey('error.auth'));
   }
     } else
       $err->add($i18n->getKey('error.auth'));
   }

diff --git a/password_change.php b/password_change.php
index f07b8b61620e748ce0741fe12dc40692918abb4a..62cc962d77015a1a5a3abb49aefb01d6ed1ae44e 100644 (file)
--- a/password_change.php
+++ b/password_change.php
@@ -81,7 +81,16 @@ if ($request->isPost()) {
 
     if ($auth->doLogin($user->login, $cl_password1)) {
       setcookie('tt_login', $user->login, time() + COOKIE_EXPIRE, '/');
 
     if ($auth->doLogin($user->login, $cl_password1)) {
       setcookie('tt_login', $user->login, time() + COOKIE_EXPIRE, '/');

-      header('Location: time.php');
+      // Redirect, depending on user role.
+      if ($user->isAdmin()) {
+        header('Location: admin_teams.php');
+      }
+      else if ($user->isClient()) {
+        header('Location: reports.php');
+      }
+      else {
+        header('Location: time.php');
+      }

       exit();
     } else {
       $err->add($i18n->getKey('error.auth'));
       exit();
     } else {
       $err->add($i18n->getKey('error.auth'));