diff --git a/debian/changelog b/debian/changelog index c7967439..afbb328e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.1) stable; urgency=low +hedera-web (1.405.2) stable; urgency=low * Initial Release. diff --git a/forms/account/conf/ui.xml b/forms/account/conf/ui.xml index 84f1344a..f2bd29b4 100755 --- a/forms/account/conf/ui.xml +++ b/forms/account/conf/ui.xml @@ -11,8 +11,7 @@ - SELECT u.id, u.name, u.recoverPass, - c.email, c.mail, c.user_id + SELECT u.id, u.name, u.email, u.recoverPass, c.mail, c.user_id FROM account.userView u LEFT JOIN customer_view c ON u.id = c.user_id diff --git a/rest/core/recover-password.php b/rest/core/recover-password.php index 9c2c2307..18bf11ce 100755 --- a/rest/core/recover-password.php +++ b/rest/core/recover-password.php @@ -9,14 +9,11 @@ class RecoverPassword extends Vn\Web\JsonRequest function run ($db) { $user = $db->getRow ( - 'SELECT c.`e-mail` mail, u.active - FROM vn2008.Clientes c - JOIN account.user u ON u.id = c.Id_Cliente - WHERE u.name = #', + 'SELECT email, active FROM account.user WHERE name = #', [$_REQUEST['recoverUser']] ); - if (!($user['active'] && $user['mail'])) + if (!($user['active'] && $user['email'])) return TRUE; $service = $this->service; @@ -24,7 +21,7 @@ class RecoverPassword extends Vn\Web\JsonRequest $url = $service->getUrl () ."#!form=account/conf&token=$token"; $report = new Vn\Web\Report ($db, 'recover-password', ['url' => $url]); - $report->sendMail ($user['mail']); + $report->sendMail ($user['email']); return TRUE; } diff --git a/web/service.php b/web/service.php index 8ec6e3ab..88381a45 100755 --- a/web/service.php +++ b/web/service.php @@ -290,6 +290,8 @@ abstract class Service Locale::addPath ('rest/'. dirname ($_REQUEST['method'])); + $res = NULL; + try { $res = $method->run ($methodDb); }