diff options
| author | thomascube <thomas@roundcube.net> | 2008-04-05 12:49:21 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2008-04-05 12:49:21 +0000 |
| commit | e70d6ea64e711096af36b1234f8545b870ea5f45 (patch) | |
| tree | 98e784b95d08418d85a17af767037e8a6e0f3f41 /config | |
| parent | cb1330b7b10ce46e466850b27300a06ed122501e (diff) | |
Apply changes from trunk to 0.1-stable
Diffstat (limited to 'config')
| -rw-r--r-- | config/db.inc.php.dist | 2 | ||||
| -rw-r--r-- | config/main.inc.php.dist | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist index 442ef6ed4..151439a54 100644 --- a/config/db.inc.php.dist +++ b/config/db.inc.php.dist @@ -15,7 +15,7 @@ $rcmail_config = array(); // PEAR database DSN for read/write operations -// format is db_provider://user:password@host/databse +// format is db_provider://user:password@host/database // currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql $rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail'; diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 8475c816d..962fb4e2f 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -180,6 +180,9 @@ $rcmail_config['flag_for_deletion'] = TRUE; // 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) $rcmail_config['mdn_requests'] = 0; +// Use this charset as fallback for message decoding +$rcmail_config['default_charset'] = 'ISO-8859-1'; + // Make use of the built-in spell checker. It is based on GoogieSpell. // Since Google only accepts connections over https your PHP installatation // requires to be compiled with Open SSL support @@ -200,6 +203,9 @@ $rcmail_config['spellcheck_languages'] = NULL; // paths are relative to the RoundCube root folder $rcmail_config['generic_message_footer'] = ''; +// add a received header to outgoing mails containing the creators IP and hostname +$rcmail_config['http_received_header'] = false; + // this string is used as a delimiter for message headers when sending // leave empty for auto-detection $rcmail_config['mail_header_delimiter'] = NULL; @@ -238,7 +244,11 @@ $rcmail_config['dont_override'] = array(); $rcmail_config['javascript_config'] = array('read_when_deleted', 'flag_for_deletion'); // try to load host-specific configuration -$rcmail_config['include_host_config'] = FALSE; +$rcmail_config['include_host_config'] = false; + +// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. +// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! +$rcmail_config['enable_installer'] = false; /***** these settings can be overwritten by user's preferences *****/ |