Skip to content

Commit 7ffd14a

Browse files
author
Marius Cramer
committed
Fixed: Invalid choices for smtp crypt in interface config
1 parent ae07073 commit 7ffd14a

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

interface/web/admin/form/system_config.tform.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,9 @@
287287
),
288288
'smtp_crypt' => array (
289289
'datatype' => 'VARCHAR',
290-
'formtype' => 'CHECKBOX',
291-
'default' => 'n',
292-
'value' => array(0 => 'n', 1 => 'y')
290+
'formtype' => 'SELECT',
291+
'default' => '',
292+
'value' => array('' => 'No', 'ssl' => 'SSL', 'tls' => 'STARTTLS')
293293
),
294294
//#################################
295295
// ENDE Datatable fields

interface/web/admin/lib/lang/de_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,5 @@ $wb['customer_no_start_txt'] = 'Kundennummer Startwert';
6565
$wb['customer_no_counter_txt'] = 'Kundennummer Zähler';
6666
$wb['session_timeout_txt'] = 'Session-Timeout (Minuten)';
6767
$wb['session_allow_endless_txt'] = '"Eingeloggt bleiben" aktivieren';
68+
$wb['No'] = 'Nein';
6869
?>

interface/web/admin/lib/lang/en_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,5 @@ $wb['customer_no_start_txt'] = 'Customer No. start value';
6565
$wb['customer_no_counter_txt'] = 'Customer No. counter';
6666
$wb['session_timeout_txt'] = 'Session timeout (minutes)';
6767
$wb['session_allow_endless_txt'] = 'Enable "stay logged in"';
68+
$wb['No'] = 'No';
6869
?>

interface/web/admin/templates/system_config_mail_edit.htm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
6262
<input name="smtp_pass" id="smtp_pass" value="" size="30" maxlength="255" type="password" class="textInput" />
6363
</div>
6464
<div class="ctrlHolder">
65-
<p class="label">{tmpl_var name='smtp_crypt_txt'}</p>
66-
<div class="multiField">
65+
<label for="smtp_crypt">{tmpl_var name='smtp_crypt_txt'}</label>
66+
<select name="smtp_crypt" id="smtp_crypt" class="selectInput formLengthHalf">
6767
{tmpl_var name='smtp_crypt'}
68-
</div>
68+
</select>
6969
</div>
7070
</fieldset>
7171

0 commit comments

Comments
 (0)