X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Froundcube%2Fmain.inc.php;h=fcd44cd13cd4acbd1e71e85a8383581a31bcff3d;hb=d0b9d5fdc267c30b1ceb29028c89f062e1900222;hp=aa38b8f497ac05774f73b6f21e94602d05da3648;hpb=b75d4503ef9c919231c0c02daf5a1ed1e57c73af;p=lhc%2Fateliers.git diff --git a/etc/roundcube/main.inc.php b/etc/roundcube/main.inc.php index aa38b8f..fcd44cd 100644 --- a/etc/roundcube/main.inc.php +++ b/etc/roundcube/main.inc.php @@ -215,11 +215,7 @@ $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")) { +if (file_exists("/home/www/data/roundcube/images/logo-$http_host.png")) { $rcmail_config['skin_logo'] = "./images/logo-$http_host.png"; } else { @@ -380,10 +376,18 @@ $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', + #'sieverules', + 'threading_as_default', + 'thunderbird_labels', ); // ---------------------------------- @@ -406,74 +410,6 @@ $rcmail_config['acl_users_field'] = 'mail'; // The LDAP search filter will be &'d with search queries $rcmail_config['acl_users_filter'] = ''; -// ---------------------------------- -// plugin managesieve -// ---------------------------------- - -// managesieve server port -$rcmail_config['managesieve_port'] = 4190; - -// managesieve server address, default is localhost. -// Replacement variables supported in host name: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['managesieve_host'] = 'localhost'; - -// authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL -// or none. Optional, defaults to best method supported by server. -$rcmail_config['managesieve_auth_type'] = null; - -// Optional managesieve authentication identifier to be used as authorization proxy. -// Authenticate as a different user but act on behalf of the logged in user. -// Works with PLAIN and DIGEST-MD5 auth. -$rcmail_config['managesieve_auth_cid'] = null; - -// Optional managesieve authentication password to be used for imap_auth_cid -$rcmail_config['managesieve_auth_pw'] = null; - -// use or not TLS for managesieve server connection -// it's because I've problems with TLS and dovecot's managesieve plugin -// and it's not needed on localhost -$rcmail_config['managesieve_usetls'] = false; - -// default contents of filters script (eg. default spam filter) -$rcmail_config['managesieve_default'] = '/home/mail/sieve/global.d'; - -// The name of the script which will be used when there's no user script -$rcmail_config['managesieve_script_name'] = 'roundcube'; - -// Sieve RFC says that we should use UTF-8 endcoding for mailbox names, -// but some implementations does not covert UTF-8 to modified UTF-7. -// Defaults to UTF7-IMAP -$rcmail_config['managesieve_mbox_encoding'] = 'UTF-8'; - -// I need this because my dovecot (with listescape plugin) uses -// ':' delimiter, but creates folders with dot delimiter -$rcmail_config['managesieve_replace_delimiter'] = ''; - -// disabled sieve extensions (body, copy, date, editheader, encoded-character, -// envelope, environment, ereject, fileinto, ihave, imap4flags, index, -// mailbox, mboxmetadata, regex, reject, relational, servermetadata, -// spamtest, spamtestplus, subaddress, vacation, variables, virustest, etc. -// Note: not all extensions are implemented -$rcmail_config['managesieve_disabled_extensions'] = array(); - -// Enables debugging of conversation with sieve server. Logs it into /sieve -$rcmail_config['managesieve_debug'] = true; - -// Enables features described in http://wiki.kolab.org/KEP:14 -$rcmail_config['managesieve_kolab_master'] = false; - -// Script name extension used for scripts including. Dovecot uses '.sieve', -// Cyrus uses '.siv'. Doesn't matter if you have managesieve_kolab_master disabled. -$rcmail_config['managesieve_filename_extension'] = '.sieve'; - -// List of reserved script names (without extension). -// Scripts listed here will be not presented to the user. -$rcmail_config['managesieve_filename_exceptions'] = array(); - // ---------------------------------- // plugin password // ---------------------------------- @@ -552,7 +488,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 +793,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; @@ -987,4 +923,73 @@ $rcmail_config['spellcheck_before_send'] = false; // Skip alternative email addresses in autocompletion (show one address per contact) $rcmail_config['autocomplete_single'] = false; +// ---------------------------------- +// plugin manage sieve +// ---------------------------------- + +// managesieve server port. When empty the port will be determined automatically +// using getservbyname() function, with 4190 as a fallback. +$rcmail_config['managesieve_port'] = 4190; + +// managesieve server address, default is localhost. +// Replacement variables supported in host name: +// %h - user's IMAP hostname +// %n - http hostname ($_SERVER['SERVER_NAME']) +// %d - domain (http hostname without the first part) +// For example %n = mail.domain.tld, %d = domain.tld +$rcmail_config['managesieve_host'] = 'localhost'; + +// authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL +// or none. Optional, defaults to best method supported by server. +$rcmail_config['managesieve_auth_type'] = null; + +// Optional managesieve authentication identifier to be used as authorization proxy. +// Authenticate as a different user but act on behalf of the logged in user. +// Works with PLAIN and DIGEST-MD5 auth. +$rcmail_config['managesieve_auth_cid'] = null; + +// Optional managesieve authentication password to be used for imap_auth_cid +$rcmail_config['managesieve_auth_pw'] = null; + +// use or not TLS for managesieve server connection +// Note: tls:// prefix in managesieve_host is also supported +$rcmail_config['managesieve_usetls'] = false; + +// default contents of filters script (eg. default spam filter) +$rcmail_config['managesieve_default'] = '/home/mail/sieve/global.d'; + + +// The name of the script which will be used when there's no user script +$rcmail_config['managesieve_script_name'] = 'roundcube'; + +// Sieve RFC says that we should use UTF-8 endcoding for mailbox names, +// but some implementations does not covert UTF-8 to modified UTF-7. +// Defaults to UTF7-IMAP +$rcmail_config['managesieve_mbox_encoding'] = 'UTF-8'; + +// I need this because my dovecot (with listescape plugin) uses +// ':' delimiter, but creates folders with dot delimiter +$rcmail_config['managesieve_replace_delimiter'] = ''; + +// disabled sieve extensions (body, copy, date, editheader, encoded-character, +// envelope, environment, ereject, fileinto, ihave, imap4flags, index, +// mailbox, mboxmetadata, regex, reject, relational, servermetadata, +// spamtest, spamtestplus, subaddress, vacation, variables, virustest, etc. +// Note: not all extensions are implemented +$rcmail_config['managesieve_disabled_extensions'] = array(); + +// Enables debugging of conversation with sieve server. Logs it into /sieve +$rcmail_config['managesieve_debug'] = false; + +// Enables features described in http://wiki.kolab.org/KEP:14 +$rcmail_config['managesieve_kolab_master'] = false; + +// Script name extension used for scripts including. Dovecot uses '.sieve', +// Cyrus uses '.siv'. Doesn't matter if you have managesieve_kolab_master disabled. +$rcmail_config['managesieve_filename_extension'] = '.sieve'; + +// List of reserved script names (without extension). +// Scripts listed here will be not presented to the user. +$rcmail_config['managesieve_filename_exceptions'] = array(); + // end of config file