X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fadministrator%2Fdefines.php;h=1b9a8674e01a910698fa21b5cf1c6beac0650881;hb=35036cf977269a06cbc59454e2fba67a00d66f16;hp=9c961c7f80e107372a8a916510ea7260b593697a;hpb=a2ccd60307a8f38fadc13b26830594ea5afffbc7;p=squirrelmail.git

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 9c961c7f..1b9a8674 100644
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -79,6 +79,10 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$signout_page' => array( 'name' => _("Signout Page"),
                                            'type' => SMOPT_TYPE_PATH,
                                            'size' => 40 ),
+				 '$provider_uri' => array( 'name' => _("Provider Link URI"),
+				 						   'type' => SMOPT_TYPE_STRING ),
+				 '$provider_name' => array( 'name' => _("Provider Name"),
+				 						    'type' => SMOPT_TYPE_STRING ),
                  '$squirrelmail_default_language' => array( 'name' => _("Default Language"),
                                                             'type' => SMOPT_TYPE_STRLIST,
                                                             'size' => 7,
@@ -110,17 +114,19 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                  'comment' => _("Use \"detect\" to auto-detect."),
                                                  'size' => 10,
                                                  'default' => 'detect' ),
-				 '$use_imap_tls' => array( 'name' => "Use TLS for IMAP connections",
+				 '$use_imap_tls' => array( 'name' => _("Use TLS for IMAP Connections"),
 				 						   'type' => SMOPT_TYPE_BOOLEAN,
-										   'comment' => "Requires PHP 4.3.x! Experimental.",
+										   'comment' => _("Requires PHP 4.3.x! Experimental."),
 										   'default' => false ),
-				 '$imap_auth_mech' => array( 'name' => "IMAP Authentication Mech",
+				 '$imap_auth_mech' => array( 'name' => _("IMAP Authentication Type"),
 				 							 'type' => SMOPT_TYPE_STRLIST,
-											 'posvals' => array('plain' => 'Plaintext',
+											 'posvals' => array('login' => 'IMAP LOGIN',
 											 				    'cram-md5' => 'CRAM-MD5',
-																'digest-md5' => 'DIGEST-MD5') ),
-                 '$useSendmail' => array( 'name' => _("Use Sendmail"),
-                                          'type' => SMOPT_TYPE_BOOLEAN ),
+																'digest-md5' => 'DIGEST-MD5'),
+											 'default' => 'login' ),
+                 '$useSendmail' => array( 'name' => _("Use Sendmail Binary"),
+                                          'type' => SMOPT_TYPE_BOOLEAN,
+										  'comment' => "Say 'no' for SMTP" ),
                  '$sendmail_path' => array( 'name' => _("Sendmail Path"),
                                             'type' => SMOPT_TYPE_STRING,
                                             'size' => 40 ),
@@ -129,17 +135,20 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                 'size' => 40 ),
                  '$smtpPort' => array( 'name' => _("SMTP Server Port"),
                                        'type' => SMOPT_TYPE_INTEGER ),
-				 '$use_smtp_tls' => array( 'name' => "Use TLS for SMTP connections",
+				 '$use_smtp_tls' => array( 'name' => _("Use TLS for SMTP Connections"),
 				 						   'type' => SMOPT_TYPE_BOOLEAN,
-										   'comment' => "Requires PHP 4.3.x! Experimental.",
+										   'comment' => _("Requires PHP 4.3.x! Experimental."),
 										   'default' => false ),
-				 '$smtp_auth_mech' => array( 'name' => "SMTP Authentication Mech",
+				 '$smtp_auth_mech' => array( 'name' => _("SMTP Authentication Type"),
 				 							 'type' => SMOPT_TYPE_STRLIST,
 											 'posvals' => array('none' => 'No SMTP auth',
-											                    'plain' => 'Plaintext',
+											 					'login' => 'Login (Plaintext)',
 																'cram-md5' => 'CRAM-MD5',
 																'digest-md5' => 'DIGEST-MD5'),
 											 'default' => 'none'),
+				 '$pop_before_smtp' => array( 'name' => _("POP3 Before SMTP?"),
+				 							  'type' => SMOPT_TYPE_BOOLEAN,
+											  'default' => false ),
                  '$invert_time' => array( 'name' => _("Invert Time"),
                                           'type' => SMOPT_TYPE_BOOLEAN ),
                  '$default_use_mdn' => array( 'name' => _("Use Confirmation Flags"),
@@ -192,6 +201,9 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                   'type' => SMOPT_TYPE_BOOLEAN ),
                  '$delete_folder' => array( 'name' => _("Auto delete folders"),
                                             'type' => SMOPT_TYPE_BOOLEAN ),
+				 '$noselect_fix_enable' => array( 'name' => _("Enable /NoSelect folder fix"),
+				 								  'type' => SMOPT_TYPE_BOOLEAN,
+												  'default' => false),
                  /* --------------------------------------------------------*/
                  'Group4' => array( 'name' => _("General Options"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -235,6 +247,20 @@ $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 ),
+				 '$allow_server_sort' => array( 'name' => _("Use server-side sorting"),
+				 							    'type' => SMOPT_TYPE_BOOLEAN,
+												'default' => false ),
+				 '$allow_thread_sort' => array( 'name' => _("Use server-side thread sorting"),
+				 								'type' => SMOPT_TYPE_BOOLEAN,
+												'default' => false ),
+				 '$allow_charset_search' => array( 'name' => _("Allow server charset search"),
+				 								   'type' => SMOPT_TYPE_BOOLEAN,
+												   'default' => false ),
+				 '$uid_support' => array( 'name' => _("UID support"),
+				 						  'type' => SMOPT_TYPE_BOOLEAN,
+										  'default' => false ),
+				 '$session_name' => array( 'name' => _("PHP session name"),
+				 						   'type' => SMOPT_TYPE_HIDDEN ),
                  /* --------------------------------------------------------*/
                  'Group5' => array( 'name' => _("Message of the Day"),
                                     'type' => SMOPT_TYPE_TITLE ),
@@ -276,9 +302,15 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$theme_css' => array( 'name' => _("Style Sheet URL (css)"),
                                         'type' => SMOPT_TYPE_PATH,
                                         'size' => 40 ),
+				 '$theme_default' => array( 'name' => _("Default theme"),
+				 							'type' => SMOPT_TYPE_INTEGER,
+											'default' => 0,
+											'comment' => _("Use index number of theme") ),
                  /* --------------------------------------------------------*/
                  '$config_use_color' => array(  'name' => '',
-                                                'type' => SMOPT_TYPE_HIDDEN )
+                                                'type' => SMOPT_TYPE_HIDDEN ),
+				 '$no_list_for_subscribe' => array( 'name' => '',
+				 									'type' => SMOPT_TYPE_HIDDEN ),
                  /* --------------------------------------------------------*/
 
                );