instead of retrieving text with 'Download as a file link' and removing link text...

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

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 72b227b3864ae444f4312c69f46ec83e88c428c4..fbff0033087d2bb0c7a686dbd3087a6de542bb6c 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -106,6 +106,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                                    'courier' => _("Courier IMAP server"),
                                                                    'macosx' => _("Mac OS X Mailserver"),
                                                                    'hmailserver' => _("hMailServer IMAP server"),
+                                                                   'mercury32' => _("Mercury/32 IMAP server"),
                                                                    'other' => _("Not one of the above servers") ) ),
                  '$optional_delimiter' => array( 'name' => _("IMAP Folder Delimiter"),
                                                  'type' => SMOPT_TYPE_STRING,
@@ -147,8 +148,8 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$pop_before_smtp' => array( 'name' => _("POP3 Before SMTP?"),
                                               'type' => SMOPT_TYPE_BOOLEAN,
                                               'default' => false ),
-                 '$skip_SM_header' => array( 'name' => _("Hide SquirrelMail Header"),
-                                          'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$encode_header_key' => array( 'name' => _("Header Encryption Key"),
+                                          'type' => SMOPT_TYPE_STRING ),
                  '$invert_time' => array( 'name' => _("Invert Time"),
                                           'type' => SMOPT_TYPE_BOOLEAN ),
                  /* --------------------------------------------------------*/
@@ -231,6 +232,9 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                             'type' => SMOPT_TYPE_BOOLEAN ),
                  '$edit_name' => array( 'name' => _("Allow editing of full name"),
                                         'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$hide_auth_header' => array( 'name' => _("Remove username from headers"),
+                                               'comment' => _("Used only when identities can't be modified"),
+                                               'type' => SMOPT_TYPE_BOOLEAN ),
                  '$allow_server_sort' => array( 'name' => _("Use server-side sorting"),
                                                 'type' => SMOPT_TYPE_BOOLEAN,
                                                 'default' => false ),
@@ -248,6 +252,13 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                     'default' => 0 ),
                  '$session_name' => array( 'name' => _("PHP session name"),
                                            'type' => SMOPT_TYPE_HIDDEN ),
+                 '$time_zone_type' => array( 'name' => _("Time Zone Configuration"),
+                                             'type' => SMOPT_TYPE_NUMLIST,
+                                             'posvals' => array( 0 => _("Standard GNU C time zones"),
+                                                                 1 => _("Strict time zones"),
+                                                                 2 => _("Custom GNU C time zones"),
+                                                                 3 => _("Custom strict time zones")),
+                                             'default' => 0 ),
                  /* --------------------------------------------------------*/
                  'Group5' => array( 'name' => _("Message of the Day"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -332,23 +343,27 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                      'type' => SMOPT_TYPE_TITLE ),
                  '$advanced_tree'  => array( 'name' => _("Use advanced tree folder listing"),
                                              'type' => SMOPT_TYPE_BOOLEAN ),
-                 '$oldway'  => array( 'name' => _("Use old folder listing functions"),
-                                      'type' => SMOPT_TYPE_BOOLEAN ),
                  '$use_icons'  => array( 'name' => _("Use icons"),
                                          'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$use_iframe' => array( 'name' => _("Use inline frames with HTML mails"),
+                                         'type' => SMOPT_TYPE_BOOLEAN ),
                  '$use_php_recode'  => array( 'name' => _("Use PHP recode functions"),
                                               'type' => SMOPT_TYPE_BOOLEAN ),
                  '$use_php_iconv'  => array( 'name' => _("Use PHP iconv functions"),
                                              'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$allow_remote_configtest' => array( 'name' => _("Allow remote configuration test"),
+                                                      'type' => SMOPT_TYPE_BOOLEAN ),
                  /* ---- Settings of address books ---- */
                  'Group11' => array( 'name' => _("Address Books"),
                                      'type' => SMOPT_TYPE_TITLE ),
                  '$default_use_javascript_addr_book' => array( 'name' => _("Default Javascript Addressbook"),
                                                   'type' => SMOPT_TYPE_BOOLEAN ),
-                 '$abook_global_file' => array( 'name' => _("Global address book file"),
-                                                  'type' => SMOPT_TYPE_STRING ),
+                 '$abook_global_file'           => array( 'name' => _("Global address book file"),
+                                                          'type' => SMOPT_TYPE_STRING ),
                  '$abook_global_file_writeable' => array( 'name' => _("Allow writing into global address book file"),
-                                                  'type' => SMOPT_TYPE_BOOLEAN ),
+                                                          'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$abook_global_file_listing'   => array( 'name' => _("Allow listing of global address book"),
+                                                          'type' => SMOPT_TYPE_BOOLEAN ),
                  /* --------------------------------------------------------*/
                  'Group7' => array( 'name' => _("Themes"),
                                     'type' => SMOPT_TYPE_TITLE ),