X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Flogin.php;h=538a0b544894ee1e27448646e3546bc9afc65175;hb=7916f561fed6b50348f144fc411ca82ee9bd5ebb;hp=f1c171a1b49a38526ad72d67490a46ec4882131c;hpb=9a23a8c0a51b7ec38a96f525484134f3cb85dc7e;p=timetracker.git

diff --git a/mobile/login.php b/mobile/login.php
index f1c171a1..538a0b54 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -31,7 +31,7 @@ import('form.Form');
 import('ttTeamHelper');
 import('ttUser');
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   $cl_login = $request->getParameter('login');
 } else {
   $cl_login = @$_COOKIE['tt_login'];
@@ -40,21 +40,21 @@ $cl_password = $request->getParameter('password');
 
 $form = new Form('loginForm');
 $form->addInput(array('type'=>'text','size'=>'25','maxlength'=>'100','name'=>'login','style'=>'width: 220px;','value'=>$cl_login));
-$form->addInput(array('type'=>'text','size'=>'25','maxlength'=>'50','name'=>'password','style'=>'width: 220px;','aspassword'=>true,'value'=>$cl_password));
+$form->addInput(array('type'=>'password','size'=>'25','maxlength'=>'50','name'=>'password','style'=>'width: 220px;','value'=>$cl_password));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_login click.
 $form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.login')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
-  if (!ttValidString($cl_password)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-	
-  if ($errors->isEmpty()) {
+  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_password)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+
+  if ($err->no()) {
 
     // Use the "limit" plugin if we have one. Ignore include errors.
     // The "limit" plugin is not required for normal operation of the Time Tracker.
     @include('../plugins/limit/access_check.php');
-      
+
     if ($auth->doLogin($cl_login, $cl_password)) {
 
       // Set current user date (as determined by user browser) into session.
@@ -64,28 +64,24 @@ if ($request->getMethod() == 'POST') {
 
       // Remember user login in a cookie.
       setcookie('tt_login', $cl_login, time() + COOKIE_EXPIRE, '/');
-      
+
       $user = new ttUser(null, $auth->getUserId());
       // Redirect, depending on user role.
       if ($user->isAdmin()) {
         header('Location: ../admin_teams.php');
-        exit();
-      }
-      else if ($user->isClient()) {
+      } elseif ($user->isClient()) {
         header('Location: ../reports.php');
-        exit();  	
-      }
-      else {
+      } else {
         header('Location: time.php');
-        exit();
       }
+      exit();
     } else
-      $errors->add($i18n->getKey('error.auth'));
+      $err->add($i18n->getKey('error.auth'));
   }
-}
+} // isPost
 
 if(!isTrue(MULTITEAM_MODE) && !ttTeamHelper::getTeams())
-  $errors->add($i18n->getKey('error.no_teams'));
+  $err->add($i18n->getKey('error.no_teams'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
 $show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);
@@ -96,4 +92,3 @@ $smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'pas
 $smarty->assign('title', $i18n->getKey('title.login'));
 $smarty->assign('content_page_name', 'mobile/login.tpl');
 $smarty->display('mobile/index.tpl');
-?>
\ No newline at end of file