Resolve conflict

diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php
index 1bf068de3929328196b0574b1af6b3b05145282b..43df787d519e10b8330a354b38b8f0760e8e3d89 100644 (file)
--- a/settings/templates/admin/server.php
+++ b/settings/templates/admin/server.php
@@ -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>