X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Flogin.php;h=a0747deb8a7af758da5302b6f8029d722d19a790;hb=a07b6f8bccda226991ced6fe25f1c9c508e423e5;hp=180f0115aab331caef626c03c50ab309262558a8;hpb=33399ff6a8bdfe9b989810dafe9c4dbf3cf3b685;p=timetracker.git diff --git a/mobile/login.php b/mobile/login.php index 180f0115..a0747deb 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']; @@ -44,17 +44,17 @@ $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 ($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']);