X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=login.php;h=d578ae94ba3e91c2c5487280961de975146bde53;hb=5305983d1ea26da9859eb1d4b54cb9a334c4ca6b;hp=20499a6f1efc0024f93b7a99edede4d383c9dc7c;hpb=d26c95718cac0a2994ab4e9633b59f420a0816b4;p=timetracker.git

diff --git a/login.php b/login.php
index 20499a6f..d578ae94 100644
--- a/login.php
+++ b/login.php
@@ -42,12 +42,12 @@ $form->addInput(array('type'=>'text','size'=>'25','maxlength'=>'50','name'=>'pas
 $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 (!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 ($errors->isEmpty()) {
+  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.
     @include('plugins/limit/access_check.php');
@@ -65,23 +65,19 @@ if ($request->getMethod() == 'POST') {
       // 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']);