X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/098a79f0819ebb89b7d48df4a6b154af4560f68e..a7ba11adfecf6cb906749efe5abce688363aef07:/login.php diff --git a/login.php b/login.php index c9ddc817..67b47da6 100644 --- a/login.php +++ b/login.php @@ -42,25 +42,25 @@ $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()) { - // Use the "limit" plugin if we have one. Ignore include errors. + + if ($errors->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'); - + if ($auth->doLogin($cl_login, $cl_password)) { // Set current user date (as determined by user browser) into session. $current_user_date = $request->getParameter('browser_today', null); if ($current_user_date) $_SESSION['date'] = $current_user_date; - + // 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()) { @@ -69,7 +69,7 @@ if ($request->getMethod() == 'POST') { } else if ($user->isClient()) { header('Location: reports.php'); - exit(); + exit(); } else { header('Location: time.php'); @@ -78,7 +78,7 @@ if ($request->getMethod() == 'POST') { } else $errors->add($i18n->getKey('error.auth')); } -} +} // POST if(!isTrue(MULTITEAM_MODE) && !ttTeamHelper::getTeams()) $errors->add($i18n->getKey('error.no_teams')); @@ -93,4 +93,3 @@ $smarty->assign('title', $i18n->getKey('title.login')); $smarty->assign('content_page_name', 'login.tpl'); $smarty->assign('about_text', $i18n->getKey('form.login.about')); $smarty->display('index.tpl'); -?> \ No newline at end of file