projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work in progress improving report formatting by placing note on a separate row.
[timetracker.git]
/
login.php
diff --git
a/login.php
b/login.php
index
e246e0a
..
68a8067
100644
(file)
--- a/
login.php
+++ b/
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');
$cl_login = $request->getParameter('login');
import('ttUser');
$cl_login = $request->getParameter('login');
@@
-62,8
+62,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 {
@@
-75,8
+75,8
@@
if ($request->isPost()) {
}
} // isPost
}
} // isPost
-if(!isTrue(
MULTITEAM_MODE) && !ttGroupHelper::getTopGroup
s())
- $err->add($i18n->get('error.no_
team
s'));
+if(!isTrue(
'MULTITEAM_MODE') && !ttOrgHelper::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']);