X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=password_change.php;h=f8c47112a873f6efa6320f3cce2bdbd53cb61ae6;hb=bf5a31da67e50256caa4dae27f54832581dbcf7c;hp=89e79c7ff3197ea2fd88a216bf71a42ebe9df113;hpb=785d404c84c153bda7d45d3aedfefa81985703b3;p=timetracker.git

diff --git a/password_change.php b/password_change.php
index 89e79c7f..f8c47112 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);
 }
@@ -62,14 +62,14 @@ $form = new Form('newPasswordForm');
 $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,7 +82,7 @@ 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');
       } elseif ($user->isClient()) {
         header('Location: reports.php');
@@ -91,12 +91,12 @@ if ($request->isPost()) {
       }
       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');