Skip to content

Admin setting PHP and SMTP casing #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 1 commit into from
Aug 9, 2016
Merged

Admin setting PHP and SMTP casing #784

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions settings/templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
];

$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'];
Copy link
Member

@jancborchardt jancborchardt Aug 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What’s this here … aren’t the two values the same? ;)

Copy link
Member

@MorrisJobke MorrisJobke Aug 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but one is the internal value and the other the shown value ;)

Copy link
Member Author

@rullzer rullzer Aug 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jancborchardt indeed one is internal and one is what we show. So internally we still use 'php' and 'smtp'. Since I did not want to change all the logic add repair steps and the likes ;)

Copy link
Member

@jancborchardt jancborchardt Aug 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks for the info :)

}
?>

Expand Down Expand Up @@ -414,10 +414,10 @@
<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>

Expand Down