X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Froundcube%2Fmain.inc.php;h=f71f88364ecc08196c7ab3b4f3f0537a6e09bffc;hp=aa38b8f497ac05774f73b6f21e94602d05da3648;hb=b0da1a3b6963f3f6d7611770c8798f8dd7cac7d4;hpb=2018969d17b305926d804dea6a9a486c4e653ee8

diff --git a/etc/roundcube/main.inc.php b/etc/roundcube/main.inc.php
index aa38b8f..f71f883 100644
--- a/etc/roundcube/main.inc.php
+++ b/etc/roundcube/main.inc.php
@@ -215,10 +215,6 @@ $rcmail_config['auto_create_user'] = true;
 
 // replace Roundcube logo with this image
 // specify an URL relative to the document root of this Roundcube installation
-$http_host=$_SERVER['HTTP_HOST'];
-if (substr($http_host, 0, strlen("roundcube.")) == "roundcube.") {
-	$http_host = substr($http_host, strlen("roundcube."));
- }
 if (file_exists("/home/www/pub/roundcube/images/logo-$http_host.png")) {
 	$rcmail_config['skin_logo'] = "./images/logo-$http_host.png";
  }
@@ -380,10 +376,17 @@ $rcmail_config['plugins'] = array(
 	'password',
 	'userinfo',
 	#'hide_blockquote',
-	'markasjunk',
+	#'markasjunk2',
 	'managesieve',
+	'chbox',
+	#'markasjunk',
+	'junk_keyword',
+	#'message_label',
+	#'all_folder_search',
 	'show_additional_headers',
 	#'subscriptions_option',
+	'threading_as_default',
+	'thunderbird_labels',
  );
 
 // ----------------------------------
@@ -552,7 +555,7 @@ $rcmail_config['message_sort_order'] = 'DESC';
 
 // These cols are shown in the message list. Available cols are:
 // subject, from, to, cc, replyto, date, size, status, flag, attachment, 'priority'
-$rcmail_config['list_cols'] = array('subject', 'status', 'from', 'date', 'size', 'flag', 'attachment');
+$rcmail_config['list_cols'] = array('subject', 'status', 'junk_keyword', 'from', 'date', 'size', 'flag', 'attachment');
 
 // the default locale setting (leave empty for auto-detection)
 // RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR
@@ -857,23 +860,23 @@ $rcmail_config['timezone'] = 'auto';
 $rcmail_config['dst_active'] = null;
 
 // prefer displaying HTML messages
-$rcmail_config['prefer_html'] = true;
+$rcmail_config['prefer_html'] = false;
 
 // display remote inline images
 // 0 - Never, always ask
 // 1 - Ask if sender is not in address book
 // 2 - Always show inline images
-$rcmail_config['show_images'] = 0;
+$rcmail_config['show_images'] = 1;
 
 // compose html formatted messages by default
 // 0 - never, 1 - always, 2 - on reply to HTML message only 
-$rcmail_config['htmleditor'] = 2;
+$rcmail_config['htmleditor'] = 0;
 
 // show pretty dates as standard
 $rcmail_config['prettydate'] = true;
 
 // save compose message every 300 seconds (5min)
-$rcmail_config['draft_autosave'] = 300;
+$rcmail_config['draft_autosave'] = 60;
 
 // default setting if preview pane is enabled
 $rcmail_config['preview_pane'] = true;