From 13b1b45ee4bab5b832ca3a1602b4c4fb6d391f86 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 3 Oct 2014 15:14:22 +0200 Subject: Refactor MailSettings controller - Do not store the password (fixes https://github.com/owncloud/core/issues/11385) - Refactor to AppFramework - Add unit tests Conflicts: settings/admin/controller.php --- settings/controller/mailsettingscontroller.php | 166 +++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 settings/controller/mailsettingscontroller.php (limited to 'settings/controller') diff --git a/settings/controller/mailsettingscontroller.php b/settings/controller/mailsettingscontroller.php new file mode 100644 index 00000000000..1cfb10c6fe9 --- /dev/null +++ b/settings/controller/mailsettingscontroller.php @@ -0,0 +1,166 @@ +l10n = $l10n; + $this->config = $config; + $this->userSession = $userSession; + $this->defaults = $defaults; + $this->mail = $mail; + $this->defaultMailAddress = $defaultMailAddress; + } + + /** + * Sets the email settings + * @param string $mail_domain + * @param string $mail_from_address + * @param string $mail_smtpmode + * @param string $mail_smtpsecure + * @param string $mail_smtphost + * @param string $mail_smtpauthtype + * @param int $mail_smtpauth + * @param string $mail_smtpport + * @return array + */ + public function setMailSettings($mail_domain, + $mail_from_address, + $mail_smtpmode, + $mail_smtpsecure, + $mail_smtphost, + $mail_smtpauthtype, + $mail_smtpauth, + $mail_smtpport) { + + $params = get_defined_vars(); + foreach($params as $key => $value) { + if(empty($value)) { + $this->config->deleteSystemValue($key); + } else { + $this->config->setSystemValue($key, $value); + } + } + + // Delete passwords from config in case no auth is specified + if($params['mail_smtpauth'] !== 1) { + $this->config->deleteSystemValue('mail_smtpname'); + $this->config->deleteSystemValue('mail_smtppassword'); + } + + return array('data' => + array('message' => + (string) $this->l10n->t('Saved') + ), + 'status' => 'success' + ); + } + + /** + * Store the credentials used for SMTP in the config + * @param string $mail_smtpname + * @param string $mail_smtppassword + * @return array + */ + public function storeCredentials($mail_smtpname, $mail_smtppassword) { + $this->config->setSystemValue('mail_smtpname', $mail_smtpname); + $this->config->setSystemValue('mail_smtppassword', $mail_smtppassword); + + return array('data' => + array('message' => + (string) $this->l10n->t('Saved') + ), + 'status' => 'success' + ); + } + + /** + * Send a mail to test the settings + * @return array + */ + public function sendTestMail() { + $email = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'email', ''); + if (!empty($email)) { + try { + $this->mail->send($email, $this->userSession->getUser()->getDisplayName(), + $this->l10n->t('test email settings'), + $this->l10n->t('If you received this email, the settings seems to be correct.'), + $this->defaultMailAddress, + $this->defaults->getName() + ); + } catch (\Exception $e) { + return array('data' => + array('message' => + (string) $this->l10n->t('A problem occurred while sending the e-mail. Please revisit your settings.'), + ), + 'status' => 'error' + ); + } + + return array('data' => + array('message' => + (string) $this->l10n->t('Email sent') + ), + 'status' => 'success' + ); + } + + return array('data' => + array('message' => + (string) $this->l10n->t('You need to set your user email before being able to send test emails.'), + ), + 'status' => 'error' + ); + } + +} -- cgit v1.2.3