diff -r f144dd621b72 -r 5524672ebbe7 squirrelmail/config.php
--- a/squirrelmail/config.php	Fri Apr 17 23:07:57 2009 +0200
+++ b/squirrelmail/config.php	Fri Apr 17 23:40:08 2009 +0200
@@ -6,26 +6,24 @@
  */
 
 global $version;
-$config_version = '1.4.0';
+$config_version   = '1.4.0';
 $config_use_color = 1;
 
-$org_name      = "Email";
-$org_logo      = SM_PATH . 'images/opkg_large.png';
+$org_name        = "Provisional Email";
+$org_logo        = SM_PATH . 'images/opkg_large.png';
 $org_logo_width  = '277';
 $org_logo_height = '88';
-$org_title     = "SquirrelMail $version";
-$signout_page  = '';
-$frame_top     = '_top';
+$org_title       = "SquirrelMail $version";
+$signout_page    = '';
+$frame_top       = '_top';
 
-$provider_uri     = 'http://www.openpkg.org/';
-
-$provider_name     = 'OpenPKG';
-
-$motd = "";
+$motd            = "";
+$provider_uri    = 'http://www.openpkg.org/';
+$provider_name   = 'OpenPKG';
 
 $squirrelmail_default_language = 'de_DE';
-$default_charset       = 'iso-8859-1';
-$lossy_encoding        = false;
+$default_charset        = 'iso-8859-1';
+$lossy_encoding         = false;
 
 $domain                 = '@l_fqdm@';
 $imapServerAddress      = '@l_fqdm@';
@@ -35,14 +33,14 @@
 $smtpPort               = 25;
 $sendmail_path          = '@l_prefix@/sbin/sendmail';
 $pop_before_smtp        = false;
-$imap_server_type       = 'cyrus';
+$imap_server_type       = 'dovecot';
 $invert_time            = false;
-$optional_delimiter     = '.';
+$optional_delimiter     = 'detect';
 
 $default_folder_prefix          = '';
-$trash_folder                   = 'INBOX.Trash';
-$sent_folder                    = 'INBOX.Sent';
-$draft_folder                   = 'INBOX.Drafts';
+$trash_folder                   = 'Trash';
+$sent_folder                    = 'Sent';
+$draft_folder                   = 'Drafts';
 $default_move_to_trash          = true;
 $default_move_to_sent           = true;
 $default_save_as_draft          = true;
@@ -55,19 +53,20 @@
 $default_unseen_notify          = 2;
 $default_unseen_type            = 1;
 $auto_create_special            = false;
-$delete_folder                  = true;
+$delete_folder                  = false;
 $noselect_fix_enable            = false;
 
 $data_dir                 = '@l_prefix@/share/squirrelmail/prefs/';
 $attachment_dir           = '@l_prefix@/var/squirrelmail/spool/attach/';
 $dir_hash_level           = 1;
 $default_left_size        = '224';
-$force_username_lowercase = false;
+$force_username_lowercase = true;
 $default_use_priority     = true;
 $hide_sm_attributions     = false;
 $default_use_mdn          = true;
 $edit_identity            = true;
 $edit_name                = true;
+$hide_auth_header         = true;
 $allow_thread_sort        = true;
 $allow_server_sort        = true;
 $allow_charset_search     = true;
@@ -91,103 +90,81 @@
 
 /* NOP, for patch line placeholder (avoids fuzz) */
 $theme_css = '';
-$theme_default = 0;
-$theme[0]['PATH'] = '@l_prefix@/share/squirrelmail/themes/default_theme.php';
-$theme[0]['NAME'] = 'Default';
-$theme[1]['PATH'] = '@l_prefix@/share/squirrelmail/themes/plain_blue_theme.php';
-$theme[1]['NAME'] = 'Plain Blue';
-$theme[2]['PATH'] = '@l_prefix@/share/squirrelmail/themes/sandstorm_theme.php';
-$theme[2]['NAME'] = 'Sand Storm';
+$theme_default = 4;
+$theme[0]['PATH'] = '@l_prefix@/share/squirrelmail/themes/bluesome.php';
+$theme[0]['NAME'] = 'Bluesome';
+$theme[1]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_green.php';
+$theme[1]['NAME'] = 'Dark Green';
+$theme[2]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_grey_theme.php';
+$theme[2]['NAME'] = 'Dark Grey';
 $theme[3]['PATH'] = '@l_prefix@/share/squirrelmail/themes/deepocean_theme.php';
 $theme[3]['NAME'] = 'Deep Ocean';
-$theme[4]['PATH'] = '@l_prefix@/share/squirrelmail/themes/slashdot_theme.php';
-$theme[4]['NAME'] = 'Slashdot';
-$theme[5]['PATH'] = '@l_prefix@/share/squirrelmail/themes/purple_theme.php';
-$theme[5]['NAME'] = 'Purple';
-$theme[6]['PATH'] = '@l_prefix@/share/squirrelmail/themes/forest_theme.php';
-$theme[6]['NAME'] = 'Forest';
-$theme[7]['PATH'] = '@l_prefix@/share/squirrelmail/themes/ice_theme.php';
-$theme[7]['NAME'] = 'Ice';
-$theme[8]['PATH'] = '@l_prefix@/share/squirrelmail/themes/seaspray_theme.php';
-$theme[8]['NAME'] = 'Sea Spray';
-$theme[9]['PATH'] = '@l_prefix@/share/squirrelmail/themes/bluesteel_theme.php';
-$theme[9]['NAME'] = 'Blue Steel';
-$theme[10]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_grey_theme.php';
-$theme[10]['NAME'] = 'Dark Grey';
-$theme[11]['PATH'] = '@l_prefix@/share/squirrelmail/themes/high_contrast_theme.php';
-$theme[11]['NAME'] = 'High Contrast';
-$theme[12]['PATH'] = '@l_prefix@/share/squirrelmail/themes/black_bean_burrito_theme.php';
-$theme[12]['NAME'] = 'Black Bean Burrito';
-$theme[13]['PATH'] = '@l_prefix@/share/squirrelmail/themes/servery_theme.php';
-$theme[13]['NAME'] = 'Servery';
-$theme[14]['PATH'] = '@l_prefix@/share/squirrelmail/themes/maize_theme.php';
-$theme[14]['NAME'] = 'Maize';
-$theme[15]['PATH'] = '@l_prefix@/share/squirrelmail/themes/bluesnews_theme.php';
-$theme[15]['NAME'] = 'BluesNews';
-$theme[16]['PATH'] = '@l_prefix@/share/squirrelmail/themes/deepocean2_theme.php';
-$theme[16]['NAME'] = 'Deep Ocean 2';
-$theme[17]['PATH'] = '@l_prefix@/share/squirrelmail/themes/blue_grey_theme.php';
-$theme[17]['NAME'] = 'Blue Grey';
-$theme[18]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dompie_theme.php';
-$theme[18]['NAME'] = 'Dompie';
-$theme[19]['PATH'] = '@l_prefix@/share/squirrelmail/themes/methodical_theme.php';
-$theme[19]['NAME'] = 'Methodical';
-$theme[20]['PATH'] = '@l_prefix@/share/squirrelmail/themes/greenhouse_effect.php';
-$theme[20]['NAME'] = 'Greenhouse Effect (Changes)';
-$theme[21]['PATH'] = '@l_prefix@/share/squirrelmail/themes/in_the_pink.php';
-$theme[21]['NAME'] = 'In The Pink (Changes)';
-$theme[22]['PATH'] = '@l_prefix@/share/squirrelmail/themes/kind_of_blue.php';
-$theme[22]['NAME'] = 'Kind of Blue (Changes)';
-$theme[23]['PATH'] = '@l_prefix@/share/squirrelmail/themes/monostochastic.php';
-$theme[23]['NAME'] = 'Monostochastic (Changes)';
-$theme[24]['PATH'] = '@l_prefix@/share/squirrelmail/themes/shades_of_grey.php';
-$theme[24]['NAME'] = 'Shades of Grey (Changes)';
-$theme[25]['PATH'] = '@l_prefix@/share/squirrelmail/themes/spice_of_life.php';
-$theme[25]['NAME'] = 'Spice of Life (Changes)';
-$theme[26]['PATH'] = '@l_prefix@/share/squirrelmail/themes/spice_of_life_lite.php';
-$theme[26]['NAME'] = 'Spice of Life - Lite (Changes)';
-$theme[27]['PATH'] = '@l_prefix@/share/squirrelmail/themes/spice_of_life_dark.php';
-$theme[27]['NAME'] = 'Spice of Life - Dark (Changes)';
-$theme[28]['PATH'] = '@l_prefix@/share/squirrelmail/themes/christmas.php';
-$theme[28]['NAME'] = 'Holiday - Christmas';
-$theme[29]['PATH'] = '@l_prefix@/share/squirrelmail/themes/darkness.php';
-$theme[29]['NAME'] = 'Darkness (Changes)';
-$theme[30]['PATH'] = '@l_prefix@/share/squirrelmail/themes/random.php';
-$theme[30]['NAME'] = 'Random (Changes every login)';
-$theme[31]['PATH'] = '@l_prefix@/share/squirrelmail/themes/midnight.php';
-$theme[31]['NAME'] = 'Midnight';
-$theme[32]['PATH'] = '@l_prefix@/share/squirrelmail/themes/alien_glow.php';
-$theme[32]['NAME'] = 'Alien Glow';
-$theme[33]['PATH'] = '@l_prefix@/share/squirrelmail/themes/dark_green.php';
-$theme[33]['NAME'] = 'Dark Green';
-$theme[34]['PATH'] = '@l_prefix@/share/squirrelmail/themes/penguin.php';
-$theme[34]['NAME'] = 'Penguin';
+$theme[4]['PATH'] = '@l_prefix@/share/squirrelmail/themes/default_theme.php';
+$theme[4]['NAME'] = 'Default';
+$theme[5]['PATH'] = '@l_prefix@/share/squirrelmail/themes/forest_theme.php';
+$theme[5]['NAME'] = 'Forest';
+$theme[6]['PATH'] = '@l_prefix@/share/squirrelmail/themes/ice_theme.php';
+$theme[6]['NAME'] = 'Ice';
+$theme[7]['PATH'] = '@l_prefix@/share/squirrelmail/themes/maize_theme.php';
+$theme[7]['NAME'] = 'Maize';
+$theme[8]['PATH'] = '@l_prefix@/share/squirrelmail/themes/purple_theme.php';
+$theme[8]['NAME'] = 'Purple';
+$theme[9]['PATH'] = '@l_prefix@/share/squirrelmail/themes/sandstorm_theme.php';
+$theme[9]['NAME'] = 'Sand Storm';
+$theme[10]['PATH'] = '@l_prefix@/share/squirrelmail/themes/seaspray_theme.php';
+$theme[10]['NAME'] = 'Sea Spray';
+$theme[11]['PATH'] = '@l_prefix@/share/squirrelmail/themes/servery_theme.php';
+$theme[11]['NAME'] = 'Servery';
+$theme[12]['PATH'] = '@l_prefix@/share/squirrelmail/themes/silver_steel_theme.php';
+$theme[12]['NAME'] = 'SilverSteel';
+$theme[13]['PATH'] = '@l_prefix@/share/squirrelmail/themes/simple_green_theme.php';
+$theme[13]['NAME'] = 'SimpleGreen';
+$theme[14]['PATH'] = '@l_prefix@/share/squirrelmail/themes/simple_purple.php';
+$theme[14]['NAME'] = 'SimplePurple';
+$theme[15]['PATH'] = '@l_prefix@/share/squirrelmail/themes/wood_theme.php';
+$theme[15]['NAME'] = 'Wood';
 
-$default_use_javascript_addr_book = false;
-$abook_global_file = '';
-$abook_global_file_writeable = false;
+$ldap_server[0] = array(
+    'host' => 'ldaps://ldap.host.tld:636/',
+    'base' => 'dc=region,dc=domain,dc=tld',
+    'name' => 'Serveur LDAP',
+    'port' => 636,
+    'binddn' => 'cn=user,dc=domain,dc=tld',
+    'bindpw' => 'password',
+    'protocol' => 3
+);
 
-$addrbook_dsn = '';
-$addrbook_table = 'address';
+$addrbook_dsn                     = '';
+$addrbook_table                   = 'address';
+$abook_global_file                = '';
+$abook_global_file_writeable      = false;
+$abook_global_file_listing        = true;
+$abook_file_line_length           = 2048;
+$default_use_javascript_addr_book = true;
 
-$prefs_dsn = '';
-$prefs_table = 'userprefs';
-$prefs_user_field = 'user';
-$prefs_key_field = 'prefkey';
-$prefs_val_field = 'prefval';
-$addrbook_global_dsn = '';
-$addrbook_global_table = 'global_abook';
+$prefs_dsn                 = '';
+$prefs_table               = 'userprefs';
+$prefs_user_field          = 'user';
+$prefs_key_field           = 'prefkey';
+$prefs_val_field           = 'prefval';
+$addrbook_global_dsn       = '';
+$addrbook_global_table     = 'global_abook';
 $addrbook_global_writeable = false;
-$addrbook_global_listing = false;
+$addrbook_global_listing   = false;
 
-$no_list_for_subscribe = false;
-$smtp_auth_mech = 'digest-md5';
-$imap_auth_mech = 'digest-md5';
-$use_imap_tls = false;
-$use_smtp_tls = false;
-$session_name = 'SQMSESSID';
+$no_list_for_subscribe     = false;
+$smtp_auth_mech            = 'digest-md5';
+$imap_auth_mech            = 'digest-md5';
+$smtp_sitewide_user        = '';
+$smtp_sitewide_pass        = '';
+$use_imap_tls              = false;
+$use_smtp_tls              = false;
+$session_name              = 'SQMSESSID';
+$only_secure_cookies       = true;
 
-@include 'config_local.php';
+$config_location_base      = '';
+
+@include SM_PATH . 'config_local.php';
 
 /**
  * Make sure there are no characters after the PHP closing