From 7ffd14a9d111e0e3140c8b1c9db40cb2fceba03b Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 10 Feb 2014 14:46:19 +0100
Subject: [PATCH] Fixed: Invalid choices for smtp crypt in interface config
---
interface/web/admin/form/system_config.tform.php | 6 +++---
interface/web/admin/lib/lang/de_system_config.lng | 1 +
interface/web/admin/lib/lang/en_system_config.lng | 1 +
interface/web/admin/templates/system_config_mail_edit.htm | 6 +++---
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 2303e61b98..771b1f1693 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -287,9 +287,9 @@ $form["tabs"]['mail'] = array (
),
'smtp_crypt' => array (
'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'n',
- 'value' => array(0 => 'n', 1 => 'y')
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'value' => array('' => 'No', 'ssl' => 'SSL', 'tls' => 'STARTTLS')
),
//#################################
// ENDE Datatable fields
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 53432cd9d3..f4103d57a2 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -65,4 +65,5 @@ $wb['customer_no_start_txt'] = 'Kundennummer Startwert';
$wb['customer_no_counter_txt'] = 'Kundennummer Zähler';
$wb['session_timeout_txt'] = 'Session-Timeout (Minuten)';
$wb['session_allow_endless_txt'] = '"Eingeloggt bleiben" aktivieren';
+$wb['No'] = 'Nein';
?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index deeda4fa02..d78478e21e 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -65,4 +65,5 @@ $wb['customer_no_start_txt'] = 'Customer No. start value';
$wb['customer_no_counter_txt'] = 'Customer No. counter';
$wb['session_timeout_txt'] = 'Session timeout (minutes)';
$wb['session_allow_endless_txt'] = 'Enable "stay logged in"';
+$wb['No'] = 'No';
?>
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index 3c8cf2b0bb..2f8b697af3 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -62,10 +62,10 @@
<input name="smtp_pass" id="smtp_pass" value="" size="30" maxlength="255" type="password" class="textInput" />
</div>
<div class="ctrlHolder">
- <p class="label">{tmpl_var name='smtp_crypt_txt'}</p>
- <div class="multiField">
+ <label for="smtp_crypt">{tmpl_var name='smtp_crypt_txt'}</label>
+ <select name="smtp_crypt" id="smtp_crypt" class="selectInput formLengthHalf">
{tmpl_var name='smtp_crypt'}
- </div>
+ </select>
</div>
</fieldset>
--
GitLab