projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More refactoring in reports.
[timetracker.git]
/
password_change.php
diff --git
a/password_change.php
b/password_change.php
index
e7d2750
..
2dce99f
100644
(file)
--- a/
password_change.php
+++ b/
password_change.php
@@
-49,8
+49,8
@@
if ($user_id) {
$smarty->assign('i18n', $i18n->keys);
}
if ($user->custom_logo) {
$smarty->assign('i18n', $i18n->keys);
}
if ($user->custom_logo) {
- $smarty->assign('custom_logo', 'images/'.$user->
team
_id.'.png');
- $smarty->assign('mobile_custom_logo', '../images/'.$user->
team
_id.'.png');
+ $smarty->assign('custom_logo', 'images/'.$user->
group
_id.'.png');
+ $smarty->assign('mobile_custom_logo', '../images/'.$user->
group
_id.'.png');
}
$smarty->assign('user', $user);
}
}
$smarty->assign('user', $user);
}
@@
-59,19
+59,19
@@
$cl_password1 = $request->getParameter('password1');
$cl_password2 = $request->getParameter('password2');
$form = new Form('newPasswordForm');
$cl_password2 = $request->getParameter('password2');
$form = new Form('newPasswordForm');
-$form->addInput(array('type'=>'
text','maxlength'=>'120','name'=>'password1','aspassword'=>true
,'value'=>$cl_password1));
-$form->addInput(array('type'=>'
text','maxlength'=>'120','name'=>'password2','aspassword'=>true
,'value'=>$cl_password2));
+$form->addInput(array('type'=>'
password','maxlength'=>'120','name'=>'password1'
,'value'=>$cl_password1));
+$form->addInput(array('type'=>'
password','maxlength'=>'120','name'=>'password2'
,'value'=>$cl_password2));
$form->addInput(array('type'=>'hidden','name'=>'ref','value'=>$cl_ref));
$form->addInput(array('type'=>'hidden','name'=>'ref','value'=>$cl_ref));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get
Key
('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-if ($request->
getMethod() == 'POST'
) {
+if ($request->
isPost()
) {
// Validate user input.
// Validate user input.
- if (!ttValidString($cl_password1)) $err
ors->add($i18n->getKey('error.field'), $i18n->getKey
('label.password'));
- if (!ttValidString($cl_password2)) $err
ors->add($i18n->getKey('error.field'), $i18n->getKey
('label.confirm_password'));
+ if (!ttValidString($cl_password1)) $err
->add($i18n->get('error.field'), $i18n->get
('label.password'));
+ if (!ttValidString($cl_password2)) $err
->add($i18n->get('error.field'), $i18n->get
('label.confirm_password'));
if ($cl_password1 !== $cl_password2)
if ($cl_password1 !== $cl_password2)
- $err
ors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey
('label.confirm_password'));
+ $err
->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get
('label.confirm_password'));
- if ($err
ors->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.
$cl_login = $user->login; // $cl_login is used in access_check.cpp.
// Use the "limit" plugin if we have one. Ignore include errors.
// The "limit" plugin is not required for normal operation of Time Tracker.
$cl_login = $user->login; // $cl_login is used in access_check.cpp.
@@
-81,15
+81,22
@@
if ($request->getMethod() == 'POST') {
if ($auth->doLogin($user->login, $cl_password1)) {
setcookie('tt_login', $user->login, time() + COOKIE_EXPIRE, '/');
if ($auth->doLogin($user->login, $cl_password1)) {
setcookie('tt_login', $user->login, time() + COOKIE_EXPIRE, '/');
- header('Location: time.php');
+ // Redirect, depending on user role.
+ if ($user->can('administer_site')) {
+ header('Location: admin_groups.php');
+ } elseif ($user->isClient()) {
+ header('Location: reports.php');
+ } else {
+ header('Location: time.php');
+ }
exit();
} else {
exit();
} else {
- $err
ors->add($i18n->getKey
('error.auth'));
+ $err
->add($i18n->get
('error.auth'));
}
}
}
}
-} //
POST
+} //
isPost
$smarty->assign('forms', array($form->getName() => $form->toArray()));
$smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->get
Key
('title.change_password'));
+$smarty->assign('title', $i18n->get('title.change_password'));
$smarty->assign('content_page_name', 'password_change.tpl');
$smarty->display('index.tpl');
$smarty->assign('content_page_name', 'password_change.tpl');
$smarty->display('index.tpl');