X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Flogin.php;h=243aa5781b8f00e88938bdc1d929a13d8cda7a32;hb=a08292683b29da0946e2099e3fd94bc2d19688f3;hp=538a0b544894ee1e27448646e3546bc9afc65175;hpb=785d404c84c153bda7d45d3aedfefa81985703b3;p=timetracker.git diff --git a/mobile/login.php b/mobile/login.php index 538a0b54..243aa578 100644 --- a/mobile/login.php +++ b/mobile/login.php @@ -28,7 +28,7 @@ require_once('../initialize.php'); import('form.Form'); -import('ttTeamHelper'); +import('ttOrgHelper'); import('ttUser'); if ($request->isPost()) { @@ -42,12 +42,12 @@ $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()) { @@ -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) && !ttTeamHelper::getTeams()) - $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');