nextcloud / server

settings/templates/admin/additional-mail.php

Indentation +23 added lines, -23 removed lines

@@ -25,27 +25,27 @@ 
 /** @var array $_ */
 
 $mail_smtpauthtype = [
-	''	=> $l->t('None'),
-	'LOGIN'	=> $l->t('Login'),
-	'PLAIN'	=> $l->t('Plain'),
-	'NTLM'	=> $l->t('NT LAN Manager'),
+    ''	=> $l->t('None'),
+    'LOGIN'	=> $l->t('Login'),
+    'PLAIN'	=> $l->t('Plain'),
+    'NTLM'	=> $l->t('NT LAN Manager'),
 ];
 
 $mail_smtpsecure = [
-	''		=> $l->t('None'),
-	'ssl'	=> $l->t('SSL/TLS'),
-	'tls'	=> $l->t('STARTTLS'),
+    ''		=> $l->t('None'),
+    'ssl'	=> $l->t('SSL/TLS'),
+    'tls'	=> $l->t('STARTTLS'),
 ];
 
 $mail_smtpmode = [
-	['php', 'PHP'],
-	['smtp', 'SMTP'],
+    ['php', 'PHP'],
+    ['smtp', 'SMTP'],
 ];
 if ($_['sendmail_is_available']) {
-	$mail_smtpmode[] = ['sendmail', 'Sendmail'];
+    $mail_smtpmode[] = ['sendmail', 'Sendmail'];
 }
 if ($_['mail_smtpmode'] === 'qmail') {
-	$mail_smtpmode[] = ['qmail', 'qmail'];
+    $mail_smtpmode[] = ['qmail', 'qmail'];
 }
 
 ?>
@@ -63,10 +63,10 @@ 
 			<label for="mail_smtpmode"><?php p($l->t('Send mode')); ?></label>
 			<select name="mail_smtpmode" id="mail_smtpmode'>
 				<?php foreach ($mail_smtpmode as $smtpmode):
-					$selected = '';
-					if ($smtpmode[0] == $_['mail_smtpmode']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($smtpmode[0] == $_['mail_smtpmode']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
 				<?php endforeach;?>
 			</select>
@@ -78,10 +78,10 @@ 
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
 				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
 				<?php foreach ($mail_smtpsecure as $secure => $name):
-					$selected = '';
-					if ($secure == $_['mail_smtpsecure']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($secure == $_['mail_smtpsecure']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
 				<?php endforeach;?>
 			</select>
@@ -99,10 +99,10 @@ 
 			<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
 			<select name="mail_smtpauthtype" id="mail_smtpauthtype'>
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
-					$selected = '';
-					if ($authtype == $_['mail_smtpauthtype']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($authtype == $_['mail_smtpauthtype']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
 				<?php endforeach;?>
 			</select>

Spacing +5 added lines, -5 removed lines

@@ -52,9 +52,9 @@ 
 
 <div class="section" id="mail_general_settings">
 	<form id="mail_general_settings_form" class="mail_settings">
-		<h2><?php p($l->t('Email server'));?></h2>
+		<h2><?php p($l->t('Email server')); ?></h2>
 		<a target="_blank" rel="noreferrer" class="icon-info"
-		   title="<?php p($l->t('Open documentation'));?>"
+		   title="<?php p($l->t('Open documentation')); ?>"
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
 
 		<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
@@ -68,7 +68,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
@@ -83,7 +83,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 		</p>
 
@@ -104,7 +104,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"

Braces +24 added lines, -6 removed lines

@@ -72,11 +72,17 @@ 
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
-				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+				<?php if ($_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 				<?php p($l->t('Encryption')); ?>
 			</label>
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
-				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+				<?php if ($_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 				<?php foreach ($mail_smtpsecure as $secure => $name):
 					$selected = '';
 					if ($secure == $_['mail_smtpsecure']):
@@ -95,7 +101,10 @@ 
 				   value="<?php p($_['mail_domain']) ?>" />
 		</p>
 
-		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
 			<select name="mail_smtpauthtype" id="mail_smtpauthtype'>
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
@@ -108,11 +117,17 @@ 
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
-				<?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
+				<?php if ($_['mail_smtpauth']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 			<label for="mail_smtpauth"><?php p($l->t('Authentication required')); ?></label>
 		</p>
 
-		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtphost"><?php p($l->t('Server address')); ?></label>
 			<input type="text" name="mail_smtphost" id="mail_smtphost" placeholder="smtp.example.com"
 				   value="<?php p($_['mail_smtphost']) ?>" />
@@ -122,7 +137,10 @@ 
 		</p>
 	</form>
 	<form class="mail_settings" id="mail_credentials_settings">
-		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label>
 			<input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
 				   value="<?php p($_['mail_smtpname']) ?>" />

lib/private/Settings/Admin/Additional.php

Indentation +47 added lines, -47 removed lines

@@ -36,57 +36,57 @@
 use OCP\Settings\ISettings;
 
 class Additional implements ISettings {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			// Mail
-			'sendmail_is_available' => (bool) \OC_Helper::findBinaryPath('sendmail'),
-			'mail_domain'           => $this->config->getSystemValue('mail_domain', ''),
-			'mail_from_address'     => $this->config->getSystemValue('mail_from_address', ''),
-			'mail_smtpmode'         => $this->config->getSystemValue('mail_smtpmode', ''),
-			'mail_smtpsecure'       => $this->config->getSystemValue('mail_smtpsecure', ''),
-			'mail_smtphost'         => $this->config->getSystemValue('mail_smtphost', ''),
-			'mail_smtpport'         => $this->config->getSystemValue('mail_smtpport', ''),
-			'mail_smtpauthtype'     => $this->config->getSystemValue('mail_smtpauthtype', ''),
-			'mail_smtpauth'         => $this->config->getSystemValue('mail_smtpauth', false),
-			'mail_smtpname'         => $this->config->getSystemValue('mail_smtpname', ''),
-			'mail_smtppassword'     => $this->config->getSystemValue('mail_smtppassword', ''),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            // Mail
+            'sendmail_is_available' => (bool) \OC_Helper::findBinaryPath('sendmail'),
+            'mail_domain'           => $this->config->getSystemValue('mail_domain', ''),
+            'mail_from_address'     => $this->config->getSystemValue('mail_from_address', ''),
+            'mail_smtpmode'         => $this->config->getSystemValue('mail_smtpmode', ''),
+            'mail_smtpsecure'       => $this->config->getSystemValue('mail_smtpsecure', ''),
+            'mail_smtphost'         => $this->config->getSystemValue('mail_smtphost', ''),
+            'mail_smtpport'         => $this->config->getSystemValue('mail_smtpport', ''),
+            'mail_smtpauthtype'     => $this->config->getSystemValue('mail_smtpauthtype', ''),
+            'mail_smtpauth'         => $this->config->getSystemValue('mail_smtpauth', false),
+            'mail_smtpname'         => $this->config->getSystemValue('mail_smtpname', ''),
+            'mail_smtppassword'     => $this->config->getSystemValue('mail_smtppassword', ''),
+        ];
 
-		if ($parameters['mail_smtppassword'] !== '') {
-			$parameters['mail_smtppassword'] = '********';
-		}
+        if ($parameters['mail_smtppassword'] !== '') {
+            $parameters['mail_smtppassword'] = '********';
+        }
 
-		return new TemplateResponse('settings', 'admin/additional-mail', $parameters, '');
-	}
+        return new TemplateResponse('settings', 'admin/additional-mail', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'additional';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'additional';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 0;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 0;
+    }
 }

settings/Controller/MailSettingsController.php

Indentation +123 added lines, -123 removed lines

@@ -38,128 +38,128 @@
  */
 class MailSettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l10n;
-	/** @var IConfig */
-	private $config;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IMailer */
-	private $mailer;
-	/** @var string */
-	private $defaultMailAddress;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param IMailer $mailer
-	 * @param string $fromMailAddress
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IL10N $l10n,
-								IConfig $config,
-								IUserSession $userSession,
-								IMailer $mailer,
-								$fromMailAddress) {
-		parent::__construct($appName, $request);
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->mailer = $mailer;
-		$this->defaultMailAddress = $fromMailAddress;
-	}
-
-	/**
-	 * Sets the email settings
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @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 DataResponse
-	 */
-	public function setMailSettings($mail_domain,
-									$mail_from_address,
-									$mail_smtpmode,
-									$mail_smtpsecure,
-									$mail_smtphost,
-									$mail_smtpauthtype,
-									$mail_smtpauth,
-									$mail_smtpport) {
-
-		$params = get_defined_vars();
-		$configs = [];
-		foreach($params as $key => $value) {
-			$configs[$key] = (empty($value)) ? null : $value;
-		}
-
-		// Delete passwords from config in case no auth is specified
-		if ($params['mail_smtpauth'] !== 1) {
-			$configs['mail_smtpname'] = null;
-			$configs['mail_smtppassword'] = null;
-		}
-
-		$this->config->setSystemValues($configs);
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Store the credentials used for SMTP in the config
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $mail_smtpname
-	 * @param string $mail_smtppassword
-	 * @return DataResponse
-	 */
-	public function storeCredentials($mail_smtpname, $mail_smtppassword) {
-		if ($mail_smtppassword === '********') {
-			return new DataResponse($this->l10n->t('Invalid SMTP password.'), Http::STATUS_BAD_REQUEST);
-		}
-
-		$this->config->setSystemValues([
-			'mail_smtpname'		=> $mail_smtpname,
-			'mail_smtppassword'	=> $mail_smtppassword,
-		]);
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Send a mail to test the settings
-	 * @return DataResponse
-	 */
-	public function sendTestMail() {
-		$email = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'email', '');
-		if (!empty($email)) {
-			try {
-				$message = $this->mailer->createMessage();
-				$message->setTo([$email => $this->userSession->getUser()->getDisplayName()]);
-				$message->setFrom([$this->defaultMailAddress]);
-				$message->setSubject($this->l10n->t('test email settings'));
-				$message->setPlainBody('If you received this email, the settings seem to be correct.');
-				$errors = $this->mailer->send($message);
-				if (!empty($errors)) {
-					throw new \RuntimeException($this->l10n->t('Mail could not be sent. Check your mail server log'));
-				}
-				return new DataResponse();
-			} catch (\Exception $e) {
-				return new DataResponse($this->l10n->t('A problem occurred while sending the email. Please revise your settings. (Error: %s)', [$e->getMessage()]), Http::STATUS_BAD_REQUEST);
-			}
-		}
-
-		return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails.'), Http::STATUS_BAD_REQUEST);
-	}
+    /** @var IL10N */
+    private $l10n;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IMailer */
+    private $mailer;
+    /** @var string */
+    private $defaultMailAddress;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param IMailer $mailer
+     * @param string $fromMailAddress
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                IMailer $mailer,
+                                $fromMailAddress) {
+        parent::__construct($appName, $request);
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->mailer = $mailer;
+        $this->defaultMailAddress = $fromMailAddress;
+    }
+
+    /**
+     * Sets the email settings
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @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 DataResponse
+     */
+    public function setMailSettings($mail_domain,
+                                    $mail_from_address,
+                                    $mail_smtpmode,
+                                    $mail_smtpsecure,
+                                    $mail_smtphost,
+                                    $mail_smtpauthtype,
+                                    $mail_smtpauth,
+                                    $mail_smtpport) {
+
+        $params = get_defined_vars();
+        $configs = [];
+        foreach($params as $key => $value) {
+            $configs[$key] = (empty($value)) ? null : $value;
+        }
+
+        // Delete passwords from config in case no auth is specified
+        if ($params['mail_smtpauth'] !== 1) {
+            $configs['mail_smtpname'] = null;
+            $configs['mail_smtppassword'] = null;
+        }
+
+        $this->config->setSystemValues($configs);
+
+        return new DataResponse();
+    }
+
+    /**
+     * Store the credentials used for SMTP in the config
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $mail_smtpname
+     * @param string $mail_smtppassword
+     * @return DataResponse
+     */
+    public function storeCredentials($mail_smtpname, $mail_smtppassword) {
+        if ($mail_smtppassword === '********') {
+            return new DataResponse($this->l10n->t('Invalid SMTP password.'), Http::STATUS_BAD_REQUEST);
+        }
+
+        $this->config->setSystemValues([
+            'mail_smtpname'		=> $mail_smtpname,
+            'mail_smtppassword'	=> $mail_smtppassword,
+        ]);
+
+        return new DataResponse();
+    }
+
+    /**
+     * Send a mail to test the settings
+     * @return DataResponse
+     */
+    public function sendTestMail() {
+        $email = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'email', '');
+        if (!empty($email)) {
+            try {
+                $message = $this->mailer->createMessage();
+                $message->setTo([$email => $this->userSession->getUser()->getDisplayName()]);
+                $message->setFrom([$this->defaultMailAddress]);
+                $message->setSubject($this->l10n->t('test email settings'));
+                $message->setPlainBody('If you received this email, the settings seem to be correct.');
+                $errors = $this->mailer->send($message);
+                if (!empty($errors)) {
+                    throw new \RuntimeException($this->l10n->t('Mail could not be sent. Check your mail server log'));
+                }
+                return new DataResponse();
+            } catch (\Exception $e) {
+                return new DataResponse($this->l10n->t('A problem occurred while sending the email. Please revise your settings. (Error: %s)', [$e->getMessage()]), Http::STATUS_BAD_REQUEST);
+            }
+        }
+
+        return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails.'), Http::STATUS_BAD_REQUEST);
+    }
 
 }