diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/db.inc.php.dist | 10 | ||||
| -rw-r--r-- | config/main.inc.php.dist | 33 | ||||
| -rw-r--r-- | config/mimetypes.php | 7 |
3 files changed, 34 insertions, 16 deletions
diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist index 49ec245ad..a596d647d 100644 --- a/config/db.inc.php.dist +++ b/config/db.inc.php.dist @@ -5,7 +5,7 @@ | Configuration file for database access | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2009, The Roundcube Dev Team | + | Copyright (C) 2005-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -31,15 +31,11 @@ $rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail'; // useful for database replication $rcmail_config['db_dsnr'] = ''; -// maximum length of a query in bytes -$rcmail_config['db_max_length'] = 512000; // 500K - // use persistent db-connections // beware this will not "always" work as expected // see: http://www.php.net/manual/en/features.persistent-connections.php $rcmail_config['db_persistent'] = FALSE; - // you can define specific table names used to store webmail data $rcmail_config['db_table_users'] = 'users'; $rcmail_config['db_table_identities'] = 'identities'; @@ -51,7 +47,8 @@ $rcmail_config['db_table_cache'] = 'cache'; $rcmail_config['db_table_cache_index'] = 'cache_index'; $rcmail_config['db_table_cache_thread'] = 'cache_thread'; $rcmail_config['db_table_cache_messages'] = 'cache_messages'; - +$rcmail_config['db_table_dictionary'] = 'dictionary'; +$rcmail_config['db_table_searches'] = 'searches'; // you can define specific sequence names used in PostgreSQL $rcmail_config['db_sequence_users'] = 'user_ids'; @@ -62,4 +59,3 @@ $rcmail_config['db_sequence_searches'] = 'search_ids'; // end db config file - diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index c8490a19d..4805b95df 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -241,7 +241,6 @@ $rcmail_config['skin_include_php'] = false; $rcmail_config['display_version'] = false; // Session lifetime in minutes -// must be greater than 'keep_alive'/60 $rcmail_config['session_lifetime'] = 10; // Session domain: .example.org @@ -365,8 +364,14 @@ $rcmail_config['identities_level'] = 0; // either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' $rcmail_config['client_mimetypes'] = null; # null == default -// mime magic database -$rcmail_config['mime_magic'] = '/usr/share/misc/magic'; +// Path to a local mime magic database file for PHPs finfo extension. +// Set to null if the default path should be used. +$rcmail_config['mime_magic'] = null; + +// Path to local mime.types mapping table. +// This is used to derive mime-types from the filename extension or vice versa. +// Such a file is usually part of the apache webserver. +$rcmail_config['mime_types'] = null; // path to imagemagick identify binary $rcmail_config['im_identify_path'] = null; @@ -374,6 +379,11 @@ $rcmail_config['im_identify_path'] = null; // path to imagemagick convert binary $rcmail_config['im_convert_path'] = null; +// Size of thumbnails from image attachments displayed below the message content. +// Note: whether images are displayed at all depends on the 'inline_images' option. +// Set to 0 to display images in full size. +$rcmail_config['image_thumbnail_size'] = 240; + // maximum size of uploaded contact photos in pixel $rcmail_config['contact_photo_size'] = 160; @@ -500,9 +510,8 @@ $rcmail_config['recipients_separator'] = ','; // don't let users set pagesize to more than this value if set $rcmail_config['max_pagesize'] = 200; -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; +// Minimal value of user's 'refresh_interval' setting (in seconds) +$rcmail_config['min_refresh_interval'] = 60; // Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. // By default refresh time is set to 1 second. You can set this value to true @@ -637,6 +646,11 @@ $rcmail_config['ldap_public']['Verisign'] = array( ), // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' 'sub_fields' => array(), + // Generate values for the following LDAP attributes automatically when creating a new record + 'autovalues' => array( + // 'uid' => 'md5(microtime())', // You may specify PHP code snippets which are then eval'ed + // 'mail' => '{givenname}.{sn}@mydomain.com', // or composite strings with placeholders for existing attributes + ), 'sort' => 'cn', // The field to sort the listing by. 'scope' => 'sub', // search mode: sub|base|list 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act @@ -781,9 +795,10 @@ $rcmail_config['read_when_deleted'] = true; // Use 'Purge' to remove messages marked as deleted $rcmail_config['flag_for_deletion'] = false; -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; +// Default interval for auto-refresh requests (in seconds) +// These are requests for system state updates e.g. checking for new messages, etc. +// Setting it to 0 disables the feature. +$rcmail_config['refresh_interval'] = 60; // If true all folders will be checked for recent messages $rcmail_config['check_all_folders'] = false; diff --git a/config/mimetypes.php b/config/mimetypes.php index f0c101304..7665df3e9 100644 --- a/config/mimetypes.php +++ b/config/mimetypes.php @@ -1,5 +1,12 @@ <?php +/** + * Local mapping file to specify mime-types based on common file-name extensions + * + * Please note that this mapping takes precedence over the content-based mime-type detection + * and should only contain mappings which cannot be detected properly from the file contents. + */ + return array( 'xls' => 'application/vnd.ms-excel', 'xlm' => 'application/vnd.ms-excel', |