X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=password_change.php;h=9302ef04e436b505367a9791e7aac9f8f4b29c19;hb=c46106d305d91e93fb63c0d601a5a006a02bb63a;hp=82ba11a4e4aa423e6e5c7033d9d10dae3b8a56a8;hpb=098a79f0819ebb89b7d48df4a6b154af4560f68e;p=timetracker.git

diff --git a/password_change.php b/password_change.php
index 82ba11a4..9302ef04 100644
--- a/password_change.php
+++ b/password_change.php
@@ -71,16 +71,15 @@ if ($request->getMethod() == 'POST') {
   if ($cl_password1 !== $cl_password2)
     $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
 
-  if ($errors->isEmpty()) {
-  	// Use the "limit" plugin if we have one. Ignore include errors.
+  if ($errors->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.
     @include('plugins/limit/access_check.php');
-  	
-  	ttUserHelper::setPassword($user_id, $cl_password1);
 
-    if ($auth->doLogin($user->login, $cl_password1)) {
+    ttUserHelper::setPassword($user_id, $cl_password1);
 
+    if ($auth->doLogin($user->login, $cl_password1)) {
       setcookie('tt_login', $user->login, time() + COOKIE_EXPIRE, '/');
       header('Location: time.php');
       exit();
@@ -88,10 +87,9 @@ if ($request->getMethod() == 'POST') {
       $errors->add($i18n->getKey('error.auth'));
     }
   }
-}
+} // POST
 
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->getKey('title.change_password'));
 $smarty->assign('content_page_name', 'password_change.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file