From 2f3167534da72b915c82ef5ef21e0abd4e6d9133 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 18 Jan 2019 15:12:15 +0800 Subject: [PATCH] Fix #5673 - Admin password reset shows error message when testing with alan@roojs.com (better error messages) --- Pman/Login.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Pman/Login.php b/Pman/Login.php index bd7d19b..9329349 100644 --- 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')) { - $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'); @@ -452,7 +454,7 @@ class Pman_Login extends Pman $sent = $mailer->send(); if (is_a($sent,'PEAR_Error') ) { $this->addEvent('SYSERR',false, $sent->getMessage()); - $this->jerr($ret->getMessage()); + $this->jerr($sent->getMessage()); } $this->addEvent('PASSREQ',$u, $u->email); -- 2.39.2