Happy New Year

[squirrelmail.git] / plugins / administrator / defines.php

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 83fec4ebcdb7e0119d96d4df8cde9cc7adb110ef..abef40442f0e72354be502e83f83cd314590d76b 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -4,7 +4,7 @@
  * Administrator plugin - Option definitions
  *
  * @author Philippe Mingo
- * @copyright 1999-2013 The SquirrelMail Project Team
+ * @copyright 1999-2020 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -129,7 +129,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                  'size' => 10,
                                                  'default' => 'detect' ),
                  '$use_imap_tls' => array( 'name' => _("IMAP Connection Security"),
-                                           'type' => SMOPT_TYPE_STRLIST,
+                                           'type' => SMOPT_TYPE_NUMLIST,
                                            'posvals' => array( 0 => _("Plain text connection"),
                                                                1 => _("Secure IMAP (TLS) connection"),
                                                                2 => _("IMAP STARTTLS connection")),
@@ -156,10 +156,10 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$smtpPort' => array( 'name' => _("SMTP Server Port"),
                                        'type' => SMOPT_TYPE_INTEGER ),
                  '$use_smtp_tls' => array( 'name' => _("SMTP Connection Security"),
-                                           'type' => SMOPT_TYPE_STRLIST,
+                                           'type' => SMOPT_TYPE_NUMLIST,
                                            'posvals' => array( 0 => _("Plain text connection"),
-                                                               1 => _("Secure IMAP (TLS) connection"),
-                                                               2 => _("IMAP STARTTLS connection")),
+                                                               1 => _("Secure SMTP (TLS) connection"),
+                                                               2 => _("SMTP STARTTLS connection")),
                                            'comment' => _("Requires higher PHP version and special functions. See SquirrelMail documentation."),
                                            'default' => 0 ),
                  '$smtp_auth_mech' => array( 'name' => _("SMTP Authentication Type"),
@@ -261,6 +261,8 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$edit_identity' => array( 'name' => _("Allow editing of identities"),
                                             'type' => SMOPT_TYPE_BOOLEAN ),
                  '$edit_name' => array( 'name' => _("Allow editing of full name"),
+                                            'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$edit_reply_to' => array( 'name' => _("Allow editing of reply-to address"),
                                         'type' => SMOPT_TYPE_BOOLEAN ),
                  '$hide_auth_header' => array( 'name' => _("Remove username from headers"),
                                                'comment' => _("Used only when identities can't be modified"),
@@ -296,6 +298,9 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$use_transparent_security_image' => array( 'name' => _("Use transparent security image"),
                                           'type' => SMOPT_TYPE_BOOLEAN,
                                           'default' => true ),
+                 '$display_imap_login_error' => array( 'name' => _("Show login error message directly from IMAP server instead of generic one"),
+                                          'type' => SMOPT_TYPE_BOOLEAN,
+                                          'default' => false ),
                  /* --------------------------------------------------------*/
                  'Group5' => array( 'name' => _("Message of the Day"),
                                     'type' => SMOPT_TYPE_TITLE ),