X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Flogin.php;h=26b75db46372024750db6a120811aff108d4f06d;hb=983999db0dd78046ebf3090e379049cbd8bc0c5a;hp=384cf8c7fc1158a2786f9c2dd445c15908184ba8;hpb=6753e281196a94e8a50d9c98d5195093e61fcefb;p=timetracker.git

diff --git a/mobile/login.php b/mobile/login.php
index 384cf8c7..26b75db4 100644
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -28,7 +28,7 @@
 
 require_once('../initialize.php');
 import('form.Form');
-import('ttGroupHelper');
+import('ttOrgHelper');
 import('ttUser');
 
 if ($request->isPost()) {
@@ -42,17 +42,17 @@ $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'=>'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->isPost()) {
   // Validate user input.
-  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 (!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 ($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.
+    // 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)) {
@@ -67,8 +67,8 @@ if ($request->isPost()) {
 
       $user = new ttUser(null, $auth->getUserId());
       // Redirect, depending on user role.
-      if ($user->isAdmin()) {
-        header('Location: ../admin_teams.php');
+      if ($user->can('administer_site')) {
+        header('Location: ../admin_groups.php');
       } elseif ($user->isClient()) {
         header('Location: ../reports.php');
       } else {
@@ -76,12 +76,12 @@ if ($request->isPost()) {
       }
       exit();
     } else
-      $err->add($i18n->getKey('error.auth'));
+      $err->add($i18n->get('error.auth'));
   }
 } // isPost
 
-if(!isTrue(MULTITEAM_MODE) && !ttGroupHelper::getTopGroups())
-  $err->add($i18n->getKey('error.no_teams'));
+if(!isTrue('MULTITEAM_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,6 +89,6 @@ $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', 'mobile/login.tpl');
 $smarty->display('mobile/index.tpl');