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

diff --git a/login.php b/login.php
index 20499a6f..8185203a 100644
--- a/login.php
+++ b/login.php
@@ -28,26 +28,25 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttOrgHelper');
 import('ttUser');
 
 $cl_login = $request->getParameter('login');
+if ($cl_login == null && $request->isGet()) $cl_login = @$_COOKIE['tt_login'];
 $cl_password = $request->getParameter('password');
-if ($cl_login == null && $request->getMethod() == 'GET')
-  $cl_login = @$_COOKIE['tt_login'];
 
 $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')));
+$form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_today.value=get_date()','value'=>$i18n->get('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->get('error.field'), $i18n->get('label.login'));
+  if (!ttValidString($cl_password)) $err->add($i18n->get('error.field'), $i18n->get('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');
@@ -63,25 +62,21 @@ if ($request->getMethod() == 'POST') {
 
       $user = new ttUser(null, $auth->getUserId());
       // Redirect, depending on user role.
-      if ($user->isAdmin()) {
-        header('Location: admin_teams.php');
-        exit();
-      }
-      else if ($user->isClient()) {
+      if ($user->can('administer_site')) {
+        header('Location: admin_groups.php');
+      } 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->get('error.auth'));
   }
-}
+} // isPost
 
-if(!isTrue(MULTITEAM_MODE) && !ttTeamHelper::getTeams())
-  $errors->add($i18n->getKey('error.no_teams'));
+if(!isTrue('MULTIORG_MODE') && !ttOrgHelper::getOrgs())
+  $err->add($i18n->get('error.no_groups'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
 $show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);
@@ -89,7 +84,7 @@ $show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_hint', $show_hint);
 $smarty->assign('onload', 'onLoad="document.loginForm.'.(!$cl_login?'login':'password').'.focus()"');
-$smarty->assign('title', $i18n->getKey('title.login'));
+$smarty->assign('title', $i18n->get('title.login'));
 $smarty->assign('content_page_name', 'login.tpl');
-$smarty->assign('about_text', $i18n->getKey('form.login.about'));
+$smarty->assign('about_text', $i18n->get('form.login.about'));
 $smarty->display('index.tpl');