mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve conflict

This commit is contained in:
Lukas Reschke 2016-08-11 19:39:32 +02:00
parent df3b708cec
commit 3ad89a76b5
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
settings/templates/admin/server.php
View File

@ -38,14 +38,14 @@ $mail_smtpsecure = [
];
$mail_smtpmode = [
'php',
'smtp',
['php', 'PHP'],
['smtp', 'SMTP'],
];
if ($_['sendmail_is_available']) {
$mail_smtpmode[] = 'sendmail';
$mail_smtpmode[] = ['sendmail', 'Sendmail'];
}
if ($_['mail_smtpmode'] == 'qmail') {
$mail_smtpmode[] = 'qmail';
$mail_smtpmode[] = ['qmail', 'qmail'];
}
?>
@ -244,10 +244,10 @@ if ($_['mail_smtpmode'] == 'qmail') {
<select name='mail_smtpmode' id='mail_smtpmode'>
<?php foreach ($mail_smtpmode as $smtpmode):
$selected = '';
if ($smtpmode == $_['mail_smtpmode']):
if ($smtpmode[0] == $_['mail_smtpmode']):
$selected = 'selected="selected"';
endif; ?>
<option value='<?php p($smtpmode)?>' <?php p($selected) ?>><?php p($smtpmode) ?></option>
<option value='<?php p($smtpmode[0])?>' <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
<?php endforeach;?>
</select>