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

diff --git a/password_change.php b/password_change.php
index 82ba11a4..2dce99f9 100644
--- a/password_change.php
+++ b/password_change.php
@@ -49,8 +49,8 @@ if ($user_id) {
     $smarty->assign('i18n', $i18n->keys);
   }
   if ($user->custom_logo) {
-    $smarty->assign('custom_logo', 'images/'.$user->team_id.'.png');
-    $smarty->assign('mobile_custom_logo', '../images/'.$user->team_id.'.png');
+    $smarty->assign('custom_logo', 'images/'.$user->group_id.'.png');
+    $smarty->assign('mobile_custom_logo', '../images/'.$user->group_id.'.png');
   }
   $smarty->assign('user', $user);
 }
@@ -59,39 +59,44 @@ $cl_password1 = $request->getParameter('password1');
 $cl_password2 = $request->getParameter('password2');
 
 $form = new Form('newPasswordForm');
-$form->addInput(array('type'=>'text','maxlength'=>'120','name'=>'password1','aspassword'=>true,'value'=>$cl_password1));
-$form->addInput(array('type'=>'text','maxlength'=>'120','name'=>'password2','aspassword'=>true,'value'=>$cl_password2));
+$form->addInput(array('type'=>'password','maxlength'=>'120','name'=>'password1','value'=>$cl_password1));
+$form->addInput(array('type'=>'password','maxlength'=>'120','name'=>'password2','value'=>$cl_password2));
 $form->addInput(array('type'=>'hidden','name'=>'ref','value'=>$cl_ref));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('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->get('error.field'), $i18n->get('label.password'));
+  if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('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->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
 
-  if ($errors->isEmpty()) {
-  	// Use the "limit" plugin if we have one. Ignore include errors.
+  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.
     @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');
+      // Redirect, depending on user role.
+      if ($user->can('administer_site')) {
+        header('Location: admin_groups.php');
+      } elseif ($user->isClient()) {
+        header('Location: reports.php');
+      } else {
+        header('Location: time.php');
+      }
       exit();
     } else {
-      $errors->add($i18n->getKey('error.auth'));
+      $err->add($i18n->get('error.auth'));
     }
   }
-}
+} // isPost
 
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.change_password'));
+$smarty->assign('title', $i18n->get('title.change_password'));
 $smarty->assign('content_page_name', 'password_change.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file