DigitaleAgentur___ALT
/
registration
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix# Exception namespace, 

should error when unable to set user email
This commit is contained in:
Pellaeon Lin 2015-07-20 07:23:09 +00:00
parent 96d584e751
commit 431b598aa7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
controller/registercontroller.php
View File

@ -105,7 +105,7 @@ class RegisterController extends Controller {
$msg = $res->render(); $msg = $res->render();
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.'); \OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
return; return;
} }
@ -152,7 +152,7 @@ class RegisterController extends Controller {
$password = $this->request->getParam('password'); $password = $this->request->getParam('password');
try { try {
$user = $this->usermanager->createUser($username, $password); $user = $this->usermanager->createUser($username, $password);
} catch (Exception $e) { } catch (\Exception $e) {
return new TemplateResponse('registration', 'form', return new TemplateResponse('registration', 'form',
array('email' => $email, array('email' => $email,
'entered_data' => array('username' => $username), 'entered_data' => array('username' => $username),
@ -170,11 +170,13 @@ class RegisterController extends Controller {
// Set user email // Set user email
try { try {
$this->config->setUserValue($user->getUID(), 'settings', 'email', $email); $this->config->setUserValue($user->getUID(), 'settings', 'email', $email);
} catch (Exception $e) { } catch (\Exception $e) {
return new TemplateResponse('registration', 'form', return new TemplateResponse('', 'error', array(
array('email' => $email, 'errors' => array(array(
'entered_data' => array('username' => $username), 'error' => $this->l10n->t('Unable to set user email: '.$e->getMessage()),
'errormsgs' => array($e->message, $username, $password)), 'guest'); 'hint' => ''
))
), 'error');
} }
// Add user to group // Add user to group
@ -183,7 +185,7 @@ class RegisterController extends Controller {
try { try {
$group = $this->groupmanager->get($registered_user_group); $group = $this->groupmanager->get($registered_user_group);
$group->addUser($user); $group->addUser($user);
} catch (Exception $e) { } catch (\Exception $e) {
return new TemplateResponse('', 'error', array( return new TemplateResponse('', 'error', array(
'errors' => array(array( 'errors' => array(array(
'error' => $e->message, 'error' => $e->message,