X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=password_change.php;h=832118f6c3fdb826e65c9a6a7d47a1997e797d2b;hb=e0ec0364d761e2dff5a7c0032f04ec1dbae50980;hp=62cc962d77015a1a5a3abb49aefb01d6ed1ae44e;hpb=98907514962d51214461614c73087dc9f0f6c2f7;p=timetracker.git

diff --git a/password_change.php b/password_change.php
index 62cc962d..832118f6 100644
--- a/password_change.php
+++ b/password_change.php
@@ -59,17 +59,17 @@ $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->isPost()) {
   // Validate user input.
-  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 (!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)
-    $err->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 ($err->no()) {
     // Use the "limit" plugin if we have one. Ignore include errors.
@@ -82,23 +82,21 @@ if ($request->isPost()) {
     if ($auth->doLogin($user->login, $cl_password1)) {
       setcookie('tt_login', $user->login, time() + COOKIE_EXPIRE, '/');
       // Redirect, depending on user role.
-      if ($user->isAdmin()) {
+      if ($user->can('administer_site')) {
         header('Location: admin_teams.php');
-      }
-      else if ($user->isClient()) {
+      } elseif ($user->isClient()) {
         header('Location: reports.php');
-      }
-      else {
+      } else {
         header('Location: time.php');
       }
       exit();
     } else {
-      $err->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');