Soem refactoring to keep things a bit more consistent.

[timetracker.git] / password_change.php

diff --git a/password_change.php b/password_change.php
index 8e56521..b6fd4dd 100644 (file)
--- a/password_change.php
+++ b/password_change.php
@@ -64,14 +64,14 @@ $form->addInput(array('type'=>'text','maxlength'=>'120','name'=>'password2','asp
 $form->addInput(array('type'=>'hidden','name'=>'ref','value'=>$cl_ref));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-  if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+  if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+  if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
   if ($cl_password1 !== $cl_password2)
-    $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+    $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
 
-  if ($errors->isEmpty()) {
+  if ($err->no()) {
     // Use the "limit" plugin if we have one. Ignore include errors.
     // The "limit" plugin is not required for normal operation of Time Tracker.
     $cl_login = $user->login; // $cl_login is used in access_check.cpp.
@@ -81,13 +81,20 @@ if ($request->getMethod() == 'POST') {
 
     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');
+      } elseif ($user->isClient()) {
+        header('Location: reports.php');
+      } else {
+        header('Location: time.php');
+      }
       exit();
     } else {
-      $errors->add($i18n->getKey('error.auth'));
+      $err->add($i18n->getKey('error.auth'));
     }
   }
-}
+} // isPost
 
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->getKey('title.change_password'));