Update# separate sending verification email to a private function

This commit is contained in:
Pellaeon Lin 2015-08-29 18:13:14 +08:00
parent 8a5ed6710e
commit 26d028bcdf
1 changed files with 16 additions and 3 deletions

View File

@ -119,8 +119,17 @@ class RegisterController extends Controller {
], 'guest'); ], 'guest');
} }
}//else var_dump($allowed_domains); }//else var_dump($allowed_domains);
return sendVerificationEmail($email);
}
/**
* Delete existing pending registration request for the email and send a new one.
* @param string $email email address to send
* @return TemplateResponse
*/
private function sendVerificationEmail($email) {
$this->pendingreg->delete($email);
$token = $this->pendingreg->save($email); $token = $this->pendingreg->save($email);
//TODO: check for error //TODO: check for error
$link = $this->urlgenerator->linkToRoute('registration.register.verifyToken', array('token' => $token)); $link = $this->urlgenerator->linkToRoute('registration.register.verifyToken', array('token' => $token));
@ -131,8 +140,12 @@ class RegisterController extends Controller {
try { try {
$this->mail->sendMail($email, 'ownCloud User', $this->l10n->t('Verify your ownCloud registration request'), $msg, $from, 'ownCloud'); $this->mail->sendMail($email, 'ownCloud User', $this->l10n->t('Verify your ownCloud registration request'), $msg, $from, 'ownCloud');
} catch (\Exception $e) { } catch (\Exception $e) {
\OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.'); return new TemplateResponse('', 'error', array(
return; 'errors' => array(array(
'error' => $this->l10n->t('A problem occurred sending email, please contact your administrator.')
'hint' => ''
))
), 'error');
} }
return new TemplateResponse('registration', 'message', array('msg' => return new TemplateResponse('registration', 'message', array('msg' =>
$this->l10n->t('Verification email successfully sent.') $this->l10n->t('Verification email successfully sent.')