Merge pull request #11570 from owncloud/backport-11408-master

Backport 11408 master

1 files changed, 77 insertions, 73 deletions

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d6bb298caef..2ea5d824909 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -6,6 +6,7 @@
  */
 /**
  * @var array $_
+ * @var \OCP\IL10N $l
  */
 $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
 $levelLabels = array(
@@ -333,87 +334,90 @@ if ($_['suggestedOverwriteWebroot']) {
 	</p>
 </div>
 
-<div class="section"><form id="mail_settings">
-	<h2><?php p($l->t('Email Server'));?></h2>
-
-	<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
-
-	<p>
-		<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 == $_['mail_smtpmode']):
-					$selected = 'selected="selected"';
-				endif; ?>
-				<option value='<?php p($smtpmode)?>' <?php p($selected) ?>><?php p($smtpmode) ?></option>
-			<?php endforeach;?>
-		</select>
-
-		<label id="mail_smtpsecure_label" for="mail_smtpsecure"
-			   <?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 foreach ($mail_smtpsecure as $secure => $name):
-				$selected = '';
-				if ($secure == $_['mail_smtpsecure']):
-					$selected = 'selected="selected"';
-				endif; ?>
-				<option value='<?php p($secure)?>' <?php p($selected) ?>><?php p($name) ?></option>
-			<?php endforeach;?>
-		</select>
-	</p>
-
-	<p>
-		<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
-		<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p($l->t('mail'))?>"
-			   value='<?php p($_['mail_from_address']) ?>' />
-		@
-		<input type="text" name='mail_domain' id="mail_domain" placeholder="example.com"
-			   value='<?php p($_['mail_domain']) ?>' />
-	</p>
+<div class="section">
+	<form id="mail_general_settings" class="mail_settings">
+		<h2><?php p($l->t('Email Server'));?></h2>
+
+		<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
+
+		<p>
+			<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 == $_['mail_smtpmode']):
+						$selected = 'selected="selected"';
+					endif; ?>
+					<option value='<?php p($smtpmode)?>' <?php p($selected) ?>><?php p($smtpmode) ?></option>
+				<?php endforeach;?>
+			</select>
+
+			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
+				   <?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 foreach ($mail_smtpsecure as $secure => $name):
+					$selected = '';
+					if ($secure == $_['mail_smtpsecure']):
+						$selected = 'selected="selected"';
+					endif; ?>
+					<option value='<?php p($secure)?>' <?php p($selected) ?>><?php p($name) ?></option>
+				<?php endforeach;?>
+			</select>
+		</p>
 
-	<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):
-				$selected = '';
-				if ($authtype == $_['mail_smtpauthtype']):
-					$selected = 'selected="selected"';
-				endif; ?>
-				<option value='<?php p($authtype)?>' <?php p($selected) ?>><?php p($name) ?></option>
-			<?php endforeach;?>
-		</select>
-
-		<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" value="1"
-			   <?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
-		<label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label>
-	</p>
+		<p>
+			<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
+			<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p($l->t('mail'))?>"
+				   value='<?php p($_['mail_from_address']) ?>' />
+			<input type="text" name='mail_domain' id="mail_domain" placeholder="example.com"
+				   value='<?php p($_['mail_domain']) ?>' />
+		</p>
 
-	<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']) ?>' />
-		:
-		<input type="text" name='mail_smtpport' id="mail_smtpport" placeholder="<?php p($l->t('Port'))?>"
-			   value='<?php p($_['mail_smtpport']) ?>' />
-	</p>
+		<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):
+					$selected = '';
+					if ($authtype == $_['mail_smtpauthtype']):
+						$selected = 'selected="selected"';
+					endif; ?>
+					<option value='<?php p($authtype)?>' <?php p($selected) ?>><?php p($name) ?></option>
+				<?php endforeach;?>
+			</select>
+
+			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" value="1"
+				   <?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
+			<label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label>
+		</p>
 
-	<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']) ?>' />
-		<input type="password" name='mail_smtppassword' id="mail_smtppassword"
-			   placeholder="<?php p($l->t('SMTP Password'))?>" value='<?php p($_['mail_smtppassword']) ?>' />
-	</p>
+		<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']) ?>' />
+			:
+			<input type="text" name='mail_smtpport' id="mail_smtpport" placeholder="<?php p($l->t('Port'))?>"
+				   value='<?php p($_['mail_smtpport']) ?>' />
+		</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"'); ?>>
+			<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']) ?>' />
+			<input type="password" name='mail_smtppassword' id="mail_smtppassword"
+				   placeholder="<?php p($l->t('SMTP Password'))?>" value='<?php p($_['mail_smtppassword']) ?>' />
+			<input id="mail_credentials_settings_submit" type="button" value="<?php p($l->t('Store credentials')) ?>">
+		</p>
+	</form>
 
 	<br />
 	<em><?php p($l->t( 'Test email settings' )); ?></em>
 	<input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t( 'Send email' )); ?>"/>
 	<span id="sendtestmail_msg" class="msg"></span>
-</form></div>
+</div>
 
 <div class="section">
 	<h2><?php p($l->t('Log'));?></h2>