projects
/
Pman.Base
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #5673 - Admin password reset shows error message when testing with alan@roojs...
[Pman.Base]
/
Pman
/
Login.php
diff --git
a/Pman/Login.php
b/Pman/Login.php
index
bd7d19b
..
9329349
100644
(file)
--- a/
Pman/Login.php
+++ b/
Pman/Login.php
@@
-406,9
+406,11
@@
class Pman_Login extends Pman
// sort out sender.
$cm = DB_DataObject::factory('core_email');
if (!$cm->get('name', 'ADMIN_PASSWORD_RESET')) {
// sort out sender.
$cm = DB_DataObject::factory('core_email');
if (!$cm->get('name', 'ADMIN_PASSWORD_RESET')) {
- $this->jerr("no template ADMIN_PASSWORD_RESET exists - please run importer ");
-
+ $this->jerr("no template Admin password reset (ADMIN_PASSWORD_RESET) exists - please run importer ");
}
}
+ if (!$cm->active) {
+ $this->jerr("template for Admin password reset has been disabled");
+ }
/*
$g = DB_DAtaObject::factory('Groups');
/*
$g = DB_DAtaObject::factory('Groups');
@@
-452,7
+454,7
@@
class Pman_Login extends Pman
$sent = $mailer->send();
if (is_a($sent,'PEAR_Error') ) {
$this->addEvent('SYSERR',false, $sent->getMessage());
$sent = $mailer->send();
if (is_a($sent,'PEAR_Error') ) {
$this->addEvent('SYSERR',false, $sent->getMessage());
- $this->jerr($
re
t->getMessage());
+ $this->jerr($
sen
t->getMessage());
}
$this->addEvent('PASSREQ',$u, $u->email);
}
$this->addEvent('PASSREQ',$u, $u->email);