projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more refactoring.
[timetracker.git]
/
mobile
/
login.php
diff --git
a/mobile/login.php
b/mobile/login.php
index
4d1412d
..
59fc600
100644
(file)
--- a/
mobile/login.php
+++ b/
mobile/login.php
@@
-28,7
+28,7
@@
require_once('../initialize.php');
import('form.Form');
require_once('../initialize.php');
import('form.Form');
-import('tt
Group
Helper');
+import('tt
Org
Helper');
import('ttUser');
if ($request->isPost()) {
import('ttUser');
if ($request->isPost()) {
@@
-52,7
+52,7
@@
if ($request->isPost()) {
if ($err->no()) {
// Use the "limit" plugin if we have one. Ignore include errors.
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)) {
@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.
$user = new ttUser(null, $auth->getUserId());
// Redirect, depending on user role.
- if ($user->
isAdmin(
)) {
- header('Location: ../admin_
team
s.php');
+ if ($user->
can('administer_site'
)) {
+ header('Location: ../admin_
group
s.php');
} elseif ($user->isClient()) {
header('Location: ../reports.php');
} else {
} elseif ($user->isClient()) {
header('Location: ../reports.php');
} else {
@@
-80,8
+80,8
@@
if ($request->isPost()) {
}
} // isPost
}
} // isPost
-if(!isTrue(MULTITEAM_MODE) && !tt
GroupHelper::getTopGroup
s())
- $err->add($i18n->get('error.no_
team
s'));
+if(!isTrue(MULTITEAM_MODE) && !tt
OrgHelper::getOrg
s())
+ $err->add($i18n->get('error.no_
group
s'));
// Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
$show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);
// Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
$show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);