Merged configuration refactoring from 'dev_config' branch back into master (#1487311)

3 files changed, 294 insertions, 222 deletions

diff --git a/config/config.inc.php.sample b/config/config.inc.php.sample
new file mode 100644
index 000000000..9a42ba9f5
--- /dev/null
+++ b/config/config.inc.php.sample
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | Local configuration for the Roundcube Webmail installation.           |
+ |                                                                       |
+ | This is a sample configuration file only containing the minumum       |
+ | setup required for a functional installation. Copy more options       |
+ | from defaults.inc.php to this file to override the defaults.          |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ +-----------------------------------------------------------------------+
+*/
+
+$config = array();
+
+// Database connection string (DSN) for read+write operations
+// Format (compatible with PEAR MDB2): db_provider://user:password@host/database
+// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv
+// For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
+// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646'
+$config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
+
+// The mail host chosen to perform the log-in.
+// Leave blank to show a textbox at login, give a list of hosts
+// to display a pulldown menu or set one host as string.
+// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
+// Supported replacement variables:
+// %n - hostname ($_SERVER['SERVER_NAME'])
+// %t - hostname without the first part
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
+// %s - domain name after the '@' from e-mail address provided at login screen
+// For example %n = mail.domain.tld, %t = domain.tld
+$config['default_host'] = 'localhost';
+
+// SMTP server host (for sending mails).
+// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
+// If left blank, the PHP mail() function is used
+// Supported replacement variables:
+// %h - user's IMAP hostname
+// %n - hostname ($_SERVER['SERVER_NAME'])
+// %t - hostname without the first part
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
+// %z - IMAP domain (IMAP hostname without the first part)
+// For example %n = mail.domain.tld, %t = domain.tld
+$config['smtp_server'] = '';
+
+// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
+// deprecated SSL over SMTP (aka SMTPS))
+$config['smtp_port'] = 25;
+
+// SMTP username (if required) if you use %u as the username Roundcube
+// will use the current username for login
+$config['smtp_user'] = '';
+
+// SMTP password (if required) if you use %p as the password Roundcube
+// will use the current user's password for login
+$config['smtp_pass'] = '';
+
+// provide an URL where a user can get support for this Roundcube installation
+// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
+$config['support_url'] = '';
+
+// Name your service. This is displayed on the login screen and in the window title
+$config['product_name'] = 'Roundcube Webmail';
+
+// this key is used to encrypt the users imap password which is stored
+// in the session record (and the client cookie if remember password is enabled).
+// please provide a string of exactly 24 chars.
+// YOUR KEY MUST BE DIFFERENT THAN THE SAMPLE VALUE FOR SECURITY REASONS
+$config['des_key'] = 'rcmail-!24ByteDESkey*Str';
+
+// List of active plugins (in plugins/ directory)
+$config['plugins'] = array(
+    'archive',
+    'zipdownload',
+);
+
+// skin name: folder from skins/
+$config['skin'] = 'larry';
diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist
deleted file mode 100644
index b1f142e56..000000000
--- a/config/db.inc.php.dist
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | Configuration file for database access                                |
- |                                                                       |
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- +-----------------------------------------------------------------------+
-*/
-
-$rcmail_config = array();
-
-// Database connection string (DSN) for read+write operations
-// Format (compatible with PEAR MDB2): db_provider://user:password@host/database
-// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv
-// For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
-// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646'
-$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
-
-// Database DSN for read-only operations (if empty write database will be used)
-// useful for database replication
-$rcmail_config['db_dsnr'] = '';
-
-// 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 (and sequence) names prefix
-$rcmail_config['db_prefix'] = '';
diff --git a/config/main.inc.php.dist b/config/defaults.inc.php
index 2c2b55327..042170437 100644
--- a/config/main.inc.php.dist
+++ b/config/defaults.inc.php
@@ -2,62 +2,84 @@
 
 /*
  +-----------------------------------------------------------------------+
- | Main configuration file                                               |
+ | Main configuration file with default settings                         |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
  | See the README file for a full license statement.                     |
- |                                                                       |
  +-----------------------------------------------------------------------+
-
 */
 
-$rcmail_config = array();
+$config = array();
+
+// ----------------------------------
+// SQL DATABASE
+// ----------------------------------
+
+// Database connection string (DSN) for read+write operations
+// Format (compatible with PEAR MDB2): db_provider://user:password@host/database
+// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv
+// For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
+// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646'
+$config['db_dsnw'] = 'mysql://roundcube:@localhost/roundcubemail';
+
+// Database DSN for read-only operations (if empty write database will be used)
+// useful for database replication
+$config['db_dsnr'] = '';
+
+// use persistent db-connections
+// beware this will not "always" work as expected
+// see: http://www.php.net/manual/en/features.persistent-connections.php
+$config['db_persistent'] = false;
+
+// you can define specific table (and sequence) names prefix
+$config['db_prefix'] = '';
+
 
 // ----------------------------------
 // LOGGING/DEBUGGING
 // ----------------------------------
 
 // system error reporting, sum of: 1 = log; 4 = show, 8 = trace
-$rcmail_config['debug_level'] = 1;
+$config['debug_level'] = 1;
 
 // log driver:  'syslog' or 'file'.
-$rcmail_config['log_driver'] = 'file';
+$config['log_driver'] = 'file';
 
 // date format for log entries
 // (read http://php.net/manual/en/function.date.php for all format characters)  
-$rcmail_config['log_date_format'] = 'd-M-Y H:i:s O';
+$config['log_date_format'] = 'd-M-Y H:i:s O';
 
 // Syslog ident string to use, if using the 'syslog' log driver.
-$rcmail_config['syslog_id'] = 'roundcube';
+$config['syslog_id'] = 'roundcube';
 
 // Syslog facility to use, if using the 'syslog' log driver.
 // For possible values see installer or http://php.net/manual/en/function.openlog.php
-$rcmail_config['syslog_facility'] = LOG_USER;
+$config['syslog_facility'] = LOG_USER;
 
 // Log sent messages to <log_dir>/sendmail or to syslog
-$rcmail_config['smtp_log'] = true;
+$config['smtp_log'] = true;
 
 // Log successful logins to <log_dir>/userlogins or to syslog
-$rcmail_config['log_logins'] = false;
+$config['log_logins'] = false;
 
 // Log session authentication errors to <log_dir>/session or to syslog
-$rcmail_config['log_session'] = false;
+$config['log_session'] = false;
 
 // Log SQL queries to <log_dir>/sql or to syslog
-$rcmail_config['sql_debug'] = false;
+$config['sql_debug'] = false;
 
 // Log IMAP conversation to <log_dir>/imap or to syslog
-$rcmail_config['imap_debug'] = false;
+$config['imap_debug'] = false;
 
 // Log LDAP conversation to <log_dir>/ldap or to syslog
-$rcmail_config['ldap_debug'] = false;
+$config['ldap_debug'] = false;
 
 // Log SMTP conversation to <log_dir>/smtp or to syslog
-$rcmail_config['smtp_debug'] = false;
+$config['smtp_debug'] = false;
 
 // ----------------------------------
 // IMAP
@@ -75,18 +97,18 @@ $rcmail_config['smtp_debug'] = false;
 // For example %n = mail.domain.tld, %t = domain.tld
 // WARNING: After hostname change update of mail_host column in users table is
 //          required to match old user data records with the new host.
-$rcmail_config['default_host'] = '';
+$config['default_host'] = 'localhost';
 
 // TCP port used for IMAP connections
-$rcmail_config['default_port'] = 143;
+$config['default_port'] = 143;
 
 // IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or null to use
 // best server supported one)
-$rcmail_config['imap_auth_type'] = null;
+$config['imap_auth_type'] = null;
 
 // If you know your imap's folder delimiter, you can specify it here.
 // Otherwise it will be determined automatically
-$rcmail_config['imap_delimiter'] = null;
+$config['imap_delimiter'] = null;
 
 // If IMAP server doesn't support NAMESPACE extension, but you're
 // using shared folders or personal root folder is non-empty, you'll need to
@@ -94,25 +116,25 @@ $rcmail_config['imap_delimiter'] = null;
 // Folders need to be ended with directory separator, e.g. "INBOX."
 // (special directory "~" is an exception to this rule)
 // These can be used also to overwrite server's namespaces
-$rcmail_config['imap_ns_personal'] = null;
-$rcmail_config['imap_ns_other']    = null;
-$rcmail_config['imap_ns_shared']   = null;
+$config['imap_ns_personal'] = null;
+$config['imap_ns_other']    = null;
+$config['imap_ns_shared']   = null;
 
 // By default IMAP capabilities are readed after connection to IMAP server
 // In some cases, e.g. when using IMAP proxy, there's a need to refresh the list
 // after login. Set to True if you've got this case.
-$rcmail_config['imap_force_caps'] = false;
+$config['imap_force_caps'] = false;
 
 // By default list of subscribed folders is determined using LIST-EXTENDED
 // extension if available. Some servers (dovecot 1.x) returns wrong results
 // for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225
 // Enable this option to force LSUB command usage instead.
 // Deprecated: Use imap_disabled_caps = array('LIST-EXTENDED')
-$rcmail_config['imap_force_lsub'] = false;
+$config['imap_force_lsub'] = false;
 
 // Some server configurations (e.g. Courier) doesn't list folders in all namespaces
 // Enable this option to force listing of folders in all namespaces
-$rcmail_config['imap_force_ns'] = false;
+$config['imap_force_ns'] = false;
 
 // List of disabled imap extensions.
 // Use if your IMAP server has broken implementation of some feature
@@ -122,25 +144,25 @@ $rcmail_config['imap_force_ns'] = false;
 $rcmail_config['imap_disabled_caps'] = array();
 
 // IMAP connection timeout, in seconds. Default: 0 (no limit)
-$rcmail_config['imap_timeout'] = 0;
+$config['imap_timeout'] = 0;
 
 // Optional IMAP authentication identifier to be used as authorization proxy
-$rcmail_config['imap_auth_cid'] = null;
+$config['imap_auth_cid'] = null;
 
 // Optional IMAP authentication password to be used for imap_auth_cid
-$rcmail_config['imap_auth_pw'] = null;
+$config['imap_auth_pw'] = null;
 
 // Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'.
-$rcmail_config['imap_cache'] = null;
+$config['imap_cache'] = null;
 
 // Enables messages cache. Only 'db' cache is supported.
-$rcmail_config['messages_cache'] = false;
+$config['messages_cache'] = false;
 
 // Lifetime of IMAP indexes cache. Possible units: s, m, h, d, w
-$rcmail_config['imap_cache_ttl'] = '10d';
+$config['imap_cache_ttl'] = '10d';
 
 // Lifetime of messages cache. Possible units: s, m, h, d, w
-$rcmail_config['messages_cache_ttl'] = '10d';
+$config['messages_cache_ttl'] = '10d';
 
 // ----------------------------------
 // SMTP
@@ -156,50 +178,50 @@ $rcmail_config['messages_cache_ttl'] = '10d';
 // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
 // %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %t = domain.tld
-$rcmail_config['smtp_server'] = '';
+$config['smtp_server'] = '';
 
 // SMTP port (default is 25; use 587 for STARTTLS or 465 for the
 // deprecated SSL over SMTP (aka SMTPS))
-$rcmail_config['smtp_port'] = 25;
+$config['smtp_port'] = 25;
 
 // SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login
-$rcmail_config['smtp_user'] = '';
+$config['smtp_user'] = '';
 
 // SMTP password (if required) if you use %p as the password Roundcube
 // will use the current user's password for login
-$rcmail_config['smtp_pass'] = '';
+$config['smtp_pass'] = '';
 
 // SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
 // best server supported one)
-$rcmail_config['smtp_auth_type'] = '';
+$config['smtp_auth_type'] = '';
 
 // Optional SMTP authentication identifier to be used as authorization proxy
-$rcmail_config['smtp_auth_cid'] = null;
+$config['smtp_auth_cid'] = null;
 
 // Optional SMTP authentication password to be used for smtp_auth_cid
-$rcmail_config['smtp_auth_pw'] = null;
+$config['smtp_auth_pw'] = null;
 
 // SMTP HELO host 
 // Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages 
 // Leave this blank and you will get the server variable 'server_name' or 
 // localhost if that isn't defined.
-$rcmail_config['smtp_helo_host'] = '';
+$config['smtp_helo_host'] = '';
 
 // SMTP connection timeout, in seconds. Default: 0 (no limit)
 // Note: There's a known issue where using ssl connection with
 // timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
-$rcmail_config['smtp_timeout'] = 0;
+$config['smtp_timeout'] = 0;
 
 // ----------------------------------
 // LDAP
 // ----------------------------------
 
 // Type of LDAP cache. Supported values: 'db', 'apc' and 'memcache'.
-$rcmail_config['ldap_cache'] = 'db';
+$config['ldap_cache'] = 'db';
 
 // Lifetime of LDAP cache. Possible units: s, m, h, d, w
-$rcmail_config['ldap_cache_ttl'] = '10m';
+$config['ldap_cache_ttl'] = '10m';
 
 // ----------------------------------
 // SYSTEM
@@ -207,98 +229,98 @@ $rcmail_config['ldap_cache_ttl'] = '10m';
 
 // 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;
+$config['enable_installer'] = false;
 
 // don't allow these settings to be overriden by the user
-$rcmail_config['dont_override'] = array();
+$config['dont_override'] = array();
 
 // provide an URL where a user can get support for this Roundcube installation
 // PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
-$rcmail_config['support_url'] = '';
+$config['support_url'] = '';
 
 // replace Roundcube logo with this image
 // specify an URL relative to the document root of this Roundcube installation
-$rcmail_config['skin_logo'] = null;
+$config['skin_logo'] = null;
 
 // automatically create a new Roundcube user when log-in the first time.
 // a new user will be created once the IMAP login succeeds.
 // set to false if only registered users can use this service
-$rcmail_config['auto_create_user'] = true;
+$config['auto_create_user'] = true;
 
 // Enables possibility to log in using email address from user identities
-$rcmail_config['user_aliases'] = false;
+$config['user_aliases'] = false;
 
 // use this folder to store log files (must be writeable for apache user)
 // This is used by the 'file' log driver.
-$rcmail_config['log_dir'] = 'logs/';
+$config['log_dir'] = 'logs/';
 
 // use this folder to store temp files (must be writeable for apache user)
-$rcmail_config['temp_dir'] = 'temp/';
+$config['temp_dir'] = 'temp/';
 
 // enforce connections over https
 // with this option enabled, all non-secure connections will be redirected.
 // set the port for the ssl connection as value of this option if it differs from the default 443
-$rcmail_config['force_https'] = false;
+$config['force_https'] = false;
 
 // tell PHP that it should work as under secure connection
 // even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set)
 // e.g. when you're running Roundcube behind a https proxy
 // this option is mutually exclusive to 'force_https' and only either one of them should be set to true.
-$rcmail_config['use_https'] = false;
+$config['use_https'] = false;
 
 // Allow browser-autocompletion on login form.
 // 0 - disabled, 1 - username and host only, 2 - username, host, password
-$rcmail_config['login_autocomplete'] = 0;
+$config['login_autocomplete'] = 0;
 
 // Forces conversion of logins to lower case.
 // 0 - disabled, 1 - only domain part, 2 - domain and local part.
 // If users authentication is case-insensitive this must be enabled.
 // Note: After enabling it all user records need to be updated, e.g. with query:
 //       UPDATE users SET username = LOWER(username);
-$rcmail_config['login_lc'] = 2;
+$config['login_lc'] = 2;
 
 // Includes should be interpreted as PHP files
-$rcmail_config['skin_include_php'] = false;
+$config['skin_include_php'] = false;
 
 // display software version on login screen
-$rcmail_config['display_version'] = false;
+$config['display_version'] = false;
 
 // Session lifetime in minutes
-$rcmail_config['session_lifetime'] = 10;
+$config['session_lifetime'] = 10;
 
 // Session domain: .example.org
-$rcmail_config['session_domain'] = '';
+$config['session_domain'] = '';
 
 // Session name. Default: 'roundcube_sessid'
-$rcmail_config['session_name'] = null;
+$config['session_name'] = null;
 
 // Session path. Defaults to PHP session.cookie_path setting.
-$rcmail_config['session_path'] = null;
+$config['session_path'] = null;
 
 // Backend to use for session storage. Can either be 'db' (default), 'memcache' or 'php'
 // If set to 'memcache', a list of servers need to be specified in 'memcache_hosts'
 // Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed
 // Setting this value to 'php' will use the default session save handler configured in PHP
-$rcmail_config['session_storage'] = 'db';
+$config['session_storage'] = 'db';
 
 // Use these hosts for accessing memcached
 // Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
-$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
+$config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
 
 // check client IP in session athorization
-$rcmail_config['ip_check'] = false;
+$config['ip_check'] = false;
 
 // check referer of incoming requests
-$rcmail_config['referer_check'] = false;
+$config['referer_check'] = false;
 
 // X-Frame-Options HTTP header value sent to prevent from Clickjacking.
 // Possible values: sameorigin|deny. Set to false in order to disable sending them
-$rcmail_config['x_frame_options'] = 'sameorigin';
+$config['x_frame_options'] = 'sameorigin';
 
 // this key is used to encrypt the users imap password which is stored
 // in the session record (and the client cookie if remember password is enabled).
 // please provide a string of exactly 24 chars.
-$rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str';
+$config['des_key'] = 'rcmail-!24ByteDESkey*Str';
 
 // Automatically add this domain to user names for login
 // Only for IMAP servers that require full e-mail addresses for login
@@ -310,7 +332,7 @@ $rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str';
 // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
 // %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %t = domain.tld
-$rcmail_config['username_domain'] = '';
+$config['username_domain'] = '';
 
 // This domain will be used to form e-mail addresses of new users
 // Specify an array with 'host' => 'domain' values to support multiple hosts
@@ -320,64 +342,64 @@ $rcmail_config['username_domain'] = '';
 // %d - domain (http hostname without the first part)
 // %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %t = domain.tld
-$rcmail_config['mail_domain'] = '';
+$config['mail_domain'] = '';
 
 // Password charset.
 // Use it if your authentication backend doesn't support UTF-8.
 // Defaults to ISO-8859-1 for backward compatibility
-$rcmail_config['password_charset'] = 'ISO-8859-1';
+$config['password_charset'] = 'ISO-8859-1';
 
 // How many seconds must pass between emails sent by a user
-$rcmail_config['sendmail_delay'] = 0;
+$config['sendmail_delay'] = 0;
 
 // Maximum number of recipients per message. Default: 0 (no limit)
-$rcmail_config['max_recipients'] = 0; 
+$config['max_recipients'] = 0; 
 
 // Maximum allowednumber of members of an address group. Default: 0 (no limit)
 // If 'max_recipients' is set this value should be less or equal
-$rcmail_config['max_group_members'] = 0; 
+$config['max_group_members'] = 0; 
 
-// add this user-agent to message headers when sending
-$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION;
+// Name your service. This is displayed on the login screen and in the window title
+$config['product_name'] = 'Roundcube Webmail';
 
-// use this name to compose page titles
-$rcmail_config['product_name'] = 'Roundcube Webmail';
+// Add this user-agent to message headers when sending
+$config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION;
 
 // try to load host-specific configuration
 // see http://trac.roundcube.net/wiki/Howto_Config for more details
-$rcmail_config['include_host_config'] = false;
+$config['include_host_config'] = false;
 
 // path to a text file which will be added to each sent message
 // paths are relative to the Roundcube root folder
-$rcmail_config['generic_message_footer'] = '';
+$config['generic_message_footer'] = '';
 
 // path to a text file which will be added to each sent HTML message
 // paths are relative to the Roundcube root folder
-$rcmail_config['generic_message_footer_html'] = '';
+$config['generic_message_footer_html'] = '';
 
 // add a received header to outgoing mails containing the creators IP and hostname
-$rcmail_config['http_received_header'] = false;
+$config['http_received_header'] = false;
 
 // Whether or not to encrypt the IP address and the host name
 // these could, in some circles, be considered as sensitive information;
 // however, for the administrator, these could be invaluable help
 // when tracking down issues.
-$rcmail_config['http_received_header_encrypt'] = false;
+$config['http_received_header_encrypt'] = false;
 
 // This string is used as a delimiter for message headers when sending
 // a message via mail() function. Leave empty for auto-detection
-$rcmail_config['mail_header_delimiter'] = NULL;
+$config['mail_header_delimiter'] = NULL;
 
 // number of chars allowed for line when wrapping text.
 // text wrapping is done when composing/sending messages
-$rcmail_config['line_length'] = 72;
+$config['line_length'] = 72;
 
 // send plaintext messages as format=flowed
-$rcmail_config['send_format_flowed'] = true;
+$config['send_format_flowed'] = true;
 
 // According to RFC2298, return receipt envelope sender address must be empty.
 // If this option is true, Roundcube will use user's identity as envelope sender for MDN responses.
-$rcmail_config['mdn_use_from'] = false;
+$config['mdn_use_from'] = false;
 
 // Set identities access level:
 // 0 - many identities with possibility to edit all params
@@ -385,50 +407,50 @@ $rcmail_config['mdn_use_from'] = false;
 // 2 - one identity with possibility to edit all params
 // 3 - one identity with possibility to edit all params but not email address
 // 4 - one identity with possibility to edit only signature
-$rcmail_config['identities_level'] = 0;
+$config['identities_level'] = 0;
 
 // Mimetypes supported by the browser.
 // attachments of these types will open in a preview window
 // 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
+$config['client_mimetypes'] = null;  # null == default
 
 // 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;
+$config['mime_magic'] = null;
 
 // Absolute path to a local mime.types mapping table file.
 // This is used to derive mime-types from the filename extension or vice versa.
 // Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system,
 // download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
-$rcmail_config['mime_types'] = null;
+$config['mime_types'] = null;
 
 // path to imagemagick identify binary
-$rcmail_config['im_identify_path'] = null;
+$config['im_identify_path'] = null;
 
 // path to imagemagick convert binary
-$rcmail_config['im_convert_path'] = null;
+$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;
+$config['image_thumbnail_size'] = 240;
 
 // maximum size of uploaded contact photos in pixel
-$rcmail_config['contact_photo_size'] = 160;
+$config['contact_photo_size'] = 160;
 
 // Enable DNS checking for e-mail address validation
-$rcmail_config['email_dns_check'] = false;
+$config['email_dns_check'] = false;
 
 // Disables saving sent messages in Sent folder (like gmail) (Default: false)
 // Note: useful when SMTP server stores sent mail in user mailbox
-$rcmail_config['no_save_sent_messages'] = false;
+$config['no_save_sent_messages'] = false;
 
 // ----------------------------------
 // PLUGINS
 // ----------------------------------
 
 // List of active plugins (in plugins/ directory)
-$rcmail_config['plugins'] = array();
+$config['plugins'] = array();
 
 // ----------------------------------
 // USER INTERFACE
@@ -436,125 +458,125 @@ $rcmail_config['plugins'] = array();
 
 // default messages sort column. Use empty value for default server's sorting, 
 // or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc'
-$rcmail_config['message_sort_col'] = '';
+$config['message_sort_col'] = '';
 
 // default messages sort order
-$rcmail_config['message_sort_order'] = 'DESC';
+$config['message_sort_order'] = 'DESC';
 
 // These cols are shown in the message list. Available cols are:
 // subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority'
-$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment');
+$config['list_cols'] = array('subject', 'status', 'fromto', '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
-$rcmail_config['language'] = null;
+$config['language'] = null;
 
 // use this format for date display (date or strftime format)
-$rcmail_config['date_format'] = 'Y-m-d';
+$config['date_format'] = 'Y-m-d';
 
 // give this choice of date formats to the user to select from
-$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
+$config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
 
 // use this format for time display (date or strftime format)
-$rcmail_config['time_format'] = 'H:i';
+$config['time_format'] = 'H:i';
 
 // give this choice of time formats to the user to select from
-$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A');
+$config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A');
 
 // use this format for short date display (derived from date_format and time_format)
-$rcmail_config['date_short'] = 'D H:i';
+$config['date_short'] = 'D H:i';
 
 // use this format for detailed date/time formatting (derived from date_format and time_format)
-$rcmail_config['date_long'] = 'Y-m-d H:i';
+$config['date_long'] = 'Y-m-d H:i';
 
 // store draft message is this mailbox
 // leave blank if draft messages should not be stored
 // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['drafts_mbox'] = 'Drafts';
+$config['drafts_mbox'] = 'Drafts';
 
 // store spam messages in this mailbox
 // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['junk_mbox'] = 'Junk';
+$config['junk_mbox'] = 'Junk';
 
 // store sent message is this mailbox
 // leave blank if sent messages should not be stored
 // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['sent_mbox'] = 'Sent';
+$config['sent_mbox'] = 'Sent';
 
 // move messages to this folder when deleting them
 // leave blank if they should be deleted directly
 // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['trash_mbox'] = 'Trash';
+$config['trash_mbox'] = 'Trash';
 
 // display these folders separately in the mailbox list.
 // these folders will also be displayed with localized names
 // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
+$config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
 
 // Disable localization of the default folder names listed above
-$rcmail_config['show_real_foldernames'] = false;
+$config['show_real_foldernames'] = false;
 
 // automatically create the above listed default folders on first login
-$rcmail_config['create_default_folders'] = false;
+$config['create_default_folders'] = false;
 
 // protect the default folders from renames, deletes, and subscription changes
-$rcmail_config['protect_default_folders'] = true;
+$config['protect_default_folders'] = true;
 
 // if in your system 0 quota means no limit set this option to true 
-$rcmail_config['quota_zero_as_unlimited'] = false;
+$config['quota_zero_as_unlimited'] = false;
 
 // 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
-$rcmail_config['enable_spellcheck'] = true;
+$config['enable_spellcheck'] = true;
 
 // Enables spellchecker exceptions dictionary.
 // Setting it to 'shared' will make the dictionary shared by all users.
-$rcmail_config['spellcheck_dictionary'] = false;
+$config['spellcheck_dictionary'] = false;
 
 // Set the spell checking engine. 'googie' is the default.
 // 'pspell' and 'enchant' are also available, but they require
 // PHP Pspell or Enchant extensions. When using Nox Spell Server, also set 'googie' here.
-$rcmail_config['spellcheck_engine'] = 'googie';
+$config['spellcheck_engine'] = 'googie';
 
 // For a locally installed Nox Spell Server, please specify the URI to call it.
 // Get Nox Spell Server from http://orangoo.com/labs/?page_id=72
 // Leave empty to use the Google spell checking service, what means
 // that the message content will be sent to Google in order to check spelling
-$rcmail_config['spellcheck_uri'] = '';
+$config['spellcheck_uri'] = '';
 
 // These languages can be selected for spell checking.
 // Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch');
 // Leave empty for default set of available language.
-$rcmail_config['spellcheck_languages'] = NULL;
+$config['spellcheck_languages'] = NULL;
 
 // Makes that words with all letters capitalized will be ignored (e.g. GOOGLE)
-$rcmail_config['spellcheck_ignore_caps'] = false;
+$config['spellcheck_ignore_caps'] = false;
 
 // Makes that words with numbers will be ignored (e.g. g00gle)
-$rcmail_config['spellcheck_ignore_nums'] = false;
+$config['spellcheck_ignore_nums'] = false;
 
 // Makes that words with symbols will be ignored (e.g. g@@gle)
-$rcmail_config['spellcheck_ignore_syms'] = false;
+$config['spellcheck_ignore_syms'] = false;
 
 // Use this char/string to separate recipients when composing a new message
-$rcmail_config['recipients_separator'] = ',';
+$config['recipients_separator'] = ',';
 
 // don't let users set pagesize to more than this value if set
-$rcmail_config['max_pagesize'] = 200;
+$config['max_pagesize'] = 200;
 
 // Minimal value of user's 'refresh_interval' setting (in seconds)
-$rcmail_config['min_refresh_interval'] = 60;
+$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
 // or any integer value indicating number of seconds.
-$rcmail_config['upload_progress'] = false;
+$config['upload_progress'] = false;
 
 // Specifies for how many seconds the Undo button will be available
 // after object delete action. Currently used with supporting address book sources.
 // Setting it to 0, disables the feature.
-$rcmail_config['undo_timeout'] = 0;
+$config['undo_timeout'] = 0;
 
 // ----------------------------------
 // ADDRESSBOOK SETTINGS
@@ -567,12 +589,12 @@ $rcmail_config['undo_timeout'] = 0;
 // SQL address book in the 'Address Book' view.
 // If set to '' then no address book will be displayed or only the
 // addressbook which is created by a plugin (like CardDAV).
-$rcmail_config['address_book_type'] = 'sql';
+$config['address_book_type'] = 'sql';
 
 // In order to enable public ldap search, configure an array like the Verisign
 // example further below. if you would like to test, simply uncomment the example.
 // Array key must contain only safe characters, ie. a-zA-Z0-9_
-$rcmail_config['ldap_public'] = array();
+$config['ldap_public'] = array();
 
 // If you are going to use LDAP for individual address books, you will need to 
 // set 'user_specific' to true and use the variables to generate the appropriate DNs to access it.
@@ -590,7 +612,7 @@ $rcmail_config['ldap_public'] = array();
 /* 
  * example config for Verisign directory
  *
-$rcmail_config['ldap_public']['Verisign'] = array(
+$config['ldap_public']['Verisign'] = array(
   'name'          => 'Verisign.com',
   // Replacement variables supported in host names:
   // %h - user's IMAP hostname
@@ -735,213 +757,213 @@ $rcmail_config['ldap_public']['Verisign'] = array(
 
 // An ordered array of the ids of the addressbooks that should be searched
 // when populating address autocomplete fields server-side. ex: array('sql','Verisign');
-$rcmail_config['autocomplete_addressbooks'] = array('sql');
+$config['autocomplete_addressbooks'] = array('sql');
 
 // The minimum number of characters required to be typed in an autocomplete field
 // before address books will be searched. Most useful for LDAP directories that
 // may need to do lengthy results building given overly-broad searches
-$rcmail_config['autocomplete_min_length'] = 1;
+$config['autocomplete_min_length'] = 1;
 
 // Number of parallel autocomplete requests.
 // If there's more than one address book, n parallel (async) requests will be created,
 // where each request will search in one address book. By default (0), all address
 // books are searched in one request.
-$rcmail_config['autocomplete_threads'] = 0;
+$config['autocomplete_threads'] = 0;
 
 // Max. numer of entries in autocomplete popup. Default: 15.
-$rcmail_config['autocomplete_max'] = 15;
+$config['autocomplete_max'] = 15;
 
 // show address fields in this order
 // available placeholders: {street}, {locality}, {zipcode}, {country}, {region}
-$rcmail_config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';
+$config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';
 
 // Matching mode for addressbook search (including autocompletion)
 // 0 - partial (*abc*), default
 // 1 - strict (abc)
 // 2 - prefix (abc*)
 // Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode
-$rcmail_config['addressbook_search_mode'] = 0;
+$config['addressbook_search_mode'] = 0;
 
 // ----------------------------------
 // USER PREFERENCES
 // ----------------------------------
 
 // Use this charset as fallback for message decoding
-$rcmail_config['default_charset'] = 'ISO-8859-1';
+$config['default_charset'] = 'ISO-8859-1';
 
 // skin name: folder from skins/
-$rcmail_config['skin'] = 'larry';
+$config['skin'] = 'larry';
 
 // Enables using standard browser windows (that can be handled as tabs)
 // instead of popup windows
-$rcmail_config['standard_windows'] = false;
+$config['standard_windows'] = false;
 
 // show up to X items in messages list view
-$rcmail_config['mail_pagesize'] = 50;
+$config['mail_pagesize'] = 50;
 
 // show up to X items in contacts list view
-$rcmail_config['addressbook_pagesize'] = 50;
+$config['addressbook_pagesize'] = 50;
 
 // sort contacts by this col (preferably either one of name, firstname, surname)
-$rcmail_config['addressbook_sort_col'] = 'surname';
+$config['addressbook_sort_col'] = 'surname';
 
 // the way how contact names are displayed in the list
 // 0: display name
 // 1: (prefix) firstname middlename surname (suffix)
 // 2: (prefix) surname firstname middlename (suffix)
 // 3: (prefix) surname, firstname middlename (suffix)
-$rcmail_config['addressbook_name_listing'] = 0;
+$config['addressbook_name_listing'] = 0;
 
 // use this timezone to display date/time
 // valid timezone identifers are listed here: php.net/manual/en/timezones.php
 // 'auto' will use the browser's timezone settings
-$rcmail_config['timezone'] = 'auto';
+$config['timezone'] = 'auto';
 
 // prefer displaying HTML messages
-$rcmail_config['prefer_html'] = true;
+$config['prefer_html'] = true;
 
 // 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;
+$config['show_images'] = 0;
 
 // open messages in new window
-$rcmail_config['message_extwin'] = false;
+$config['message_extwin'] = false;
 
 // open message compose form in new window
-$rcmail_config['compose_extwin'] = false;
+$config['compose_extwin'] = false;
 
 // compose html formatted messages by default
 // 0 - never, 1 - always, 2 - on reply to HTML message, 3 - on forward or reply to HTML message
-$rcmail_config['htmleditor'] = 0;
+$config['htmleditor'] = 0;
 
 // show pretty dates as standard
-$rcmail_config['prettydate'] = true;
+$config['prettydate'] = true;
 
 // save compose message every 300 seconds (5min)
-$rcmail_config['draft_autosave'] = 300;
+$config['draft_autosave'] = 300;
 
 // default setting if preview pane is enabled
-$rcmail_config['preview_pane'] = false;
+$config['preview_pane'] = false;
 
 // Mark as read when viewed in preview pane (delay in seconds)
 // Set to -1 if messages in preview pane should not be marked as read
-$rcmail_config['preview_pane_mark_read'] = 0;
+$config['preview_pane_mark_read'] = 0;
 
 // Clear Trash on logout
-$rcmail_config['logout_purge'] = false;
+$config['logout_purge'] = false;
 
 // Compact INBOX on logout
-$rcmail_config['logout_expunge'] = false;
+$config['logout_expunge'] = false;
 
 // Display attached images below the message body 
-$rcmail_config['inline_images'] = true;
+$config['inline_images'] = true;
 
 // Encoding of long/non-ascii attachment names:
 // 0 - Full RFC 2231 compatible
 // 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default)
 // 2 - Full 2047 compatible
-$rcmail_config['mime_param_folding'] = 1;
+$config['mime_param_folding'] = 1;
 
 // Set true if deleted messages should not be displayed
 // This will make the application run slower
-$rcmail_config['skip_deleted'] = false;
+$config['skip_deleted'] = false;
 
 // Set true to Mark deleted messages as read as well as deleted
 // False means that a message's read status is not affected by marking it as deleted
-$rcmail_config['read_when_deleted'] = true;
+$config['read_when_deleted'] = true;
 
 // Set to true to never delete messages immediately
 // Use 'Purge' to remove messages marked as deleted
-$rcmail_config['flag_for_deletion'] = false;
+$config['flag_for_deletion'] = false;
 
 // 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;
+$config['refresh_interval'] = 60;
 
 // If true all folders will be checked for recent messages
-$rcmail_config['check_all_folders'] = false;
+$config['check_all_folders'] = false;
 
 // If true, after message delete/move, the next message will be displayed
-$rcmail_config['display_next'] = true;
+$config['display_next'] = true;
 
 // 0 - Do not expand threads 
 // 1 - Expand all threads automatically 
 // 2 - Expand only threads with unread messages 
-$rcmail_config['autoexpand_threads'] = 0;
+$config['autoexpand_threads'] = 0;
 
 // When replying:
 // -1 - don't cite the original message
 // 0  - place cursor below the original message
 // 1  - place cursor above original message (top posting)
-$rcmail_config['reply_mode'] = 0;
+$config['reply_mode'] = 0;
 
 // When replying strip original signature from message
-$rcmail_config['strip_existing_sig'] = true;
+$config['strip_existing_sig'] = true;
 
 // Show signature:
 // 0 - Never
 // 1 - Always
 // 2 - New messages only
 // 3 - Forwards and Replies only
-$rcmail_config['show_sig'] = 1;
+$config['show_sig'] = 1;
 
 // Use MIME encoding (quoted-printable) for 8bit characters in message body
-$rcmail_config['force_7bit'] = false;
+$config['force_7bit'] = false;
 
 // Defaults of the search field configuration.
 // The array can contain a per-folder list of header fields which should be considered when searching
 // The entry with key '*' stands for all folders which do not have a specific list set.
-// Please note that folder names should to be in sync with $rcmail_config['default_folders']
-$rcmail_config['search_mods'] = null;  // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1));
+// Please note that folder names should to be in sync with $config['default_folders']
+$config['search_mods'] = null;  // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1));
 
 // Defaults of the addressbook search field configuration.
-$rcmail_config['addressbook_search_mods'] = null;  // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1);
+$config['addressbook_search_mods'] = null;  // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1);
 
 // 'Delete always'
 // This setting reflects if mail should be always deleted
 // when moving to Trash fails. This is necessary in some setups
 // when user is over quota and Trash is included in the quota.
-$rcmail_config['delete_always'] = false;
+$config['delete_always'] = false;
 
 // Directly delete messages in Junk instead of moving to Trash
-$rcmail_config['delete_junk'] = false;
+$config['delete_junk'] = false;
 
 // Behavior if a received message requests a message delivery notification (read receipt)
 // 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask)
 // 3 = send automatically if sender is in addressbook, otherwise ask the user
 // 4 = send automatically if sender is in addressbook, otherwise ignore
-$rcmail_config['mdn_requests'] = 0;
+$config['mdn_requests'] = 0;
 
 // Return receipt checkbox default state
-$rcmail_config['mdn_default'] = 0;
+$config['mdn_default'] = 0;
 
 // Delivery Status Notification checkbox default state
-$rcmail_config['dsn_default'] = 0;
+$config['dsn_default'] = 0;
 
 // Place replies in the folder of the message being replied to
-$rcmail_config['reply_same_folder'] = false;
+$config['reply_same_folder'] = false;
 
 // Sets default mode of Forward feature to "forward as attachment"
-$rcmail_config['forward_attachment'] = false;
+$config['forward_attachment'] = false;
 
 // Defines address book (internal index) to which new contacts will be added
 // By default it is the first writeable addressbook.
 // Note: Use '0' for built-in address book.
-$rcmail_config['default_addressbook'] = null;
+$config['default_addressbook'] = null;
 
 // Enables spell checking before sending a message.
-$rcmail_config['spellcheck_before_send'] = false;
+$config['spellcheck_before_send'] = false;
 
 // Skip alternative email addresses in autocompletion (show one address per contact)
-$rcmail_config['autocomplete_single'] = false;
+$config['autocomplete_single'] = false;
 
 // Default font for composed HTML message.
 // Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New,
 // Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana
-$rcmail_config['default_font'] = 'Verdana';
+$config['default_font'] = 'Verdana';
 
 // Enables display of email address with name instead of a name (and address in title)
-$rcmail_config['message_show_email'] = false;
+$config['message_show_email'] = false;