Просмотр исходного кода

Upgrade Roundcube to 1.6 (#2810)

* Merge "Roudcube" config files to common
* Add  /install/common/ folder to main.sh
* Upgrade RC to 1.6.0
* Update installers and use non ssl
* Also update "Update script" roundcube
* Rename 1.6.5 to 1.6.6

And add check to make sure it is localhost
Jaap Marcus 3 лет назад
Родитель
Сommit
eca25ef067

+ 7 - 7
bin/v-add-sys-roundcube

@@ -46,7 +46,7 @@ if [ -z "$HESTIA" ]; then
     HESTIA="/usr/local/hestia"
 fi
 
-if [ -z "$HOMEDIR" ] || [ -z "$HESTIA_INSTALL_DIR" ]; then
+if [ -z "$HOMEDIR" ] || [ -z "$HESTIA_COMMON_DIR" ]; then
     echo "ERROR: Environment variables not present, installation aborted."
     exit 2
 fi
@@ -97,21 +97,21 @@ if [ "$UPDATE" == "no" ]; then
     rm -f -r $RC_INSTALL_DIR/config/
     ln -s $RC_CONFIG_DIR/ ./config
     # Replace with Hestia config
-    cp -f $HESTIA_INSTALL_DIR/roundcube/main.inc.php $RC_CONFIG_DIR/config.inc.php
-    cp -f $HESTIA_INSTALL_DIR/roundcube/mimetypes.php $RC_CONFIG_DIR/mimetypes.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/main.inc.php $RC_CONFIG_DIR/config.inc.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/mimetypes.php $RC_CONFIG_DIR/mimetypes.php
     chmod 644 $RC_CONFIG_DIR/*.php
     
-    cp -f $HESTIA_INSTALL_DIR/roundcube/hestia.php $RC_INSTALL_DIR/plugins/password/drivers/
+    cp -f $HESTIA_COMMON_DIR/roundcube/hestia.php $RC_INSTALL_DIR/plugins/password/drivers/
     mkdir -p $RC_CONFIG_DIR/plugins/password
     mkdir -p $RC_CONFIG_DIR/plugins/newmail_notifier
     mkdir -p $RC_CONFIG_DIR/plugins/zipdownload
     
     # Allow changes to the respective config / Create symlinks to /etc/roundcube/ 
-    cp -f $HESTIA_INSTALL_DIR/roundcube/config.inc.php $RC_CONFIG_DIR/plugins/password/config.inc.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/config.inc.php $RC_CONFIG_DIR/plugins/password/config.inc.php
     ln -s $RC_CONFIG_DIR/plugins/password/config.inc.php ./plugins/password/config.inc.php
-    cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_newmail_notifier.inc.php $RC_CONFIG_DIR/plugins/newmail_notifier/config.inc.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/plugins/config_newmail_notifier.inc.php $RC_CONFIG_DIR/plugins/newmail_notifier/config.inc.php
     ln -s $RC_CONFIG_DIR/plugins/newmail_notifier/config.inc.php ./plugins/newmail_notifier/config.inc.php
-    cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_zipdownload.inc.php $RC_CONFIG_DIR/plugins/zipdownload/config.inc.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/plugins/config_zipdownload.inc.php $RC_CONFIG_DIR/plugins/zipdownload/config.inc.php
     ln -s $RC_CONFIG_DIR/plugins/zipdownload/config.inc.php ./plugins/zipdownload/config.inc.php
     
     # Set up correct permissions roundcube    

+ 2 - 1
func/main.sh

@@ -14,7 +14,8 @@ BACKUP_DISK_LIMIT=95
 BACKUP_LA_LIMIT=`cat /proc/cpuinfo | grep processor | wc -l`
 RRD_STEP=300
 BIN=$HESTIA/bin
-HESTIA_INSTALL_DIR=$HESTIA/install/deb
+HESTIA_INSTALL_DIR="$HESTIA/install/deb"
+HESTIA_COMMON_DIR="$HESTIA/install/common"
 HESTIA_BACKUP="/root/hst_backups/$(date +%d%m%Y%H%M)"
 USER_DATA=$HESTIA/data/users/$user
 WEBTPL=$HESTIA/data/templates/web

+ 0 - 0
install/deb/roundcube/apache.conf → install/common/roundcube/apache.conf


+ 0 - 0
install/deb/roundcube/config.inc.php → install/common/roundcube/config.inc.php


+ 0 - 0
install/deb/roundcube/db.inc.php → install/common/roundcube/db.inc.php


+ 0 - 0
install/deb/roundcube/hestia.php → install/common/roundcube/hestia.php


+ 2 - 5
install/deb/roundcube/main.inc.php → install/common/roundcube/main.inc.php

@@ -29,10 +29,7 @@ $config['smtp_debug'] = true;
 // 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.
-$config['default_host'] = 'ssl://localhost';
-
-// TCP port used for IMAP connections
-$config['default_port'] = 993;
+$config['imap_host'] = 'localhost:143';
 
 // IMAP socket context options
 // See http://php.net/manual/en/context.ssl.php
@@ -103,7 +100,7 @@ $config['default_user'] = '%u';
 
 $config['default_pass'] = '%p';
 
-$config['smtp_host'] = 'ssl://localhost';
+$config['smtp_host'] = 'localhost:587';
 
 // Log session authentication errors to <log_dir>/session or to syslog
 $config['log_session'] = true;

+ 0 - 0
install/deb/roundcube/mimetypes.php → install/common/roundcube/mimetypes.php


+ 1 - 5
install/deb/roundcube/plugins/config_managesieve.inc.php → install/common/roundcube/plugins/config_managesieve.inc.php

@@ -1,16 +1,12 @@
 <?php
 
-// managesieve server port. When empty the port will be determined automatically
-// using getservbyname() function, with 4190 as a fallback.
-$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
-$config['managesieve_host'] = 'localhost';
+$config['managesieve_host'] = 'localhost:4190';
 
 // authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL
 // or none. Optional, defaults to best method supported by server.

+ 0 - 0
install/deb/roundcube/plugins/config_newmail_notifier.inc.php → install/common/roundcube/plugins/config_newmail_notifier.inc.php


+ 0 - 0
install/deb/roundcube/plugins/config_zipdownload.inc.php → install/common/roundcube/plugins/config_zipdownload.inc.php


+ 1 - 1
install/hst-install-debian.sh

@@ -1842,7 +1842,7 @@ if [ "$sieve" = 'yes' ]; then
     if [ -d "/var/lib/roundcube" ]; then
         # Modify Roundcube config 
         mkdir -p $RC_CONFIG_DIR/plugins/managesieve
-        cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
+        cp -f $HESTIA_COMMON_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
         ln -s $RC_CONFIG_DIR/plugins/managesieve/config.inc.php $RC_INSTALL_DIR/plugins/managesieve/config.inc.php
         chown -R root:www-data $RC_CONFIG_DIR/
         chmod 751 -R $RC_CONFIG_DIR

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -1906,7 +1906,7 @@ if [ "$sieve" = 'yes' ]; then
     if [ -d "/var/lib/roundcube" ]; then
         # Modify Roundcube config 
         mkdir -p $RC_CONFIG_DIR/plugins/managesieve
-        cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
+        cp -f $HESTIA_COMMON_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
         ln -s $RC_CONFIG_DIR/plugins/managesieve/config.inc.php $RC_INSTALL_DIR/plugins/managesieve/config.inc.php
         chown -R root:www-data $RC_CONFIG_DIR/
         chmod 751 -R $RC_CONFIG_DIR

+ 0 - 40
install/rpm/roundcube/apache.conf

@@ -1,40 +0,0 @@
-Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
-Alias /roundcube /var/lib/roundcube
-Alias /webmail /var/lib/roundcube
-
-# Access to tinymce files
-<Directory "/usr/share/tinymce/www/">
-      Options Indexes MultiViews FollowSymLinks
-      AllowOverride None
-      Order allow,deny
-      allow from all
-</Directory>
-
-<Directory /var/lib/roundcube/>
-  Options +FollowSymLinks
-  # This is needed to parse /var/lib/roundcube/.htaccess. See its
-  # content before setting AllowOverride to None.
-  AllowOverride All
-  order allow,deny
-  allow from all
-</Directory>
-
-# Protecting basic directories:
-<Directory /var/lib/roundcube/config>
-        Options -FollowSymLinks
-        AllowOverride None
-</Directory>
-
-<Directory /var/lib/roundcube/temp>
-        Options -FollowSymLinks
-        AllowOverride None
-	Order allow,deny
-	Deny from all
-</Directory>
-
-<Directory /var/lib/roundcube/logs>
-        Options -FollowSymLinks
-        AllowOverride None
-	Order allow,deny
-	Deny from all
-</Directory>

+ 0 - 32
install/rpm/roundcube/config.inc.php

@@ -1,32 +0,0 @@
-<?php
-
-// Password Plugin options
-// -----------------------
-// A driver to use for password change. Default: "sql".
-// See README file for list of supported driver names.
-$rcmail_config['password_driver'] = 'hestia';
-
-// Require the new password to be a certain length.
-// set to blank to allow passwords of any length
-$rcmail_config['password_minimum_length'] = 8;
-
-// Require the new password to contain a letter and punctuation character
-// Change to false to remove this check.
-$rcmail_config['password_require_nonalpha'] = false;
-
-// Enables logging of password changes into logs/password
-$rcmail_config['password_log'] = false;
-
-// Comma-separated list of login exceptions for which password change
-// will be not available (no Password tab in Settings)
-$rcmail_config['password_login_exceptions'] = null;
-
-// By default domains in variables are using unicode.
-// Enable this option to use punycoded names
-$rcmail_config['password_idn_ascii'] = false;
-
-// Hestia Driver options
-// -----------------------
-// Control Panel host
-$rcmail_config['password_hestia_host'] = 'localhost';
-$rcmail_config['password_hestia_port'] = '8083';

+ 0 - 66
install/rpm/roundcube/db.inc.php

@@ -1,66 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | Configuration file for database access                                |
- |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
-*/
-
-$rcmail_config = array();
-
-// PEAR database DSN for read/write operations
-// format is db_provider://user:password@host/database 
-
-$rcmail_config['db_dsnw'] = 'mysql://roundcube:%password%@localhost/roundcube';
-// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail';
-
-// PEAR database DSN for read only operations (if empty write database will be used)
-// useful for database replication
-$rcmail_config['db_dsnr'] = '';
-
-// database backend to use (only db or mdb2 are supported)
-//$rcmail_config['db_backend'] = 'mdb2';
-
-// 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';
-
-$rcmail_config['db_table_contacts'] = 'contacts';
-
-$rcmail_config['db_table_session'] = 'session';
-
-$rcmail_config['db_table_cache'] = 'cache';
-
-$rcmail_config['db_table_messages'] = 'messages';
-
-
-// you can define specific sequence names used in PostgreSQL
-$rcmail_config['db_sequence_users'] = 'user_ids';
-
-$rcmail_config['db_sequence_identities'] = 'identity_ids';
-
-$rcmail_config['db_sequence_contacts'] = 'contact_ids';
-
-$rcmail_config['db_sequence_cache'] = 'cache_ids';
-
-$rcmail_config['db_sequence_messages'] = 'message_ids';
-
-
-// end db config file
-?>

+ 0 - 73
install/rpm/roundcube/hestia.php

@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Hestia Control Panel Password Driver
- *
- * @version 1.0
- * @author HestiaCP <info@hestiacp.com>
- */
-class rcube_hestia_password {
-    function save($curpass, $passwd)
-    {
-        $rcmail = rcmail::get_instance();
-        $hestia_host = $rcmail->config->get('password_hestia_host');
-
-        if (empty($hestia_host))
-        {
-            $hestia_host = 'localhost';
-        }
-
-        $hestia_port = $rcmail->config->get('password_hestia_port');
-        if (empty($hestia_port))
-        {
-            $hestia_port = '8083';
-        }
-
-        $postvars = array(
-          'email' => $_SESSION['username'],
-          'password' => $curpass,
-          'new' => $passwd
-        );
-
-        $postdata = http_build_query($postvars);
-
-        $send  = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL;
-        $send .= 'Host: ' . $hestia_host . PHP_EOL;
-        $send .= 'User-Agent: PHP Script' . PHP_EOL;
-        $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL;
-        $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL;
-        $send .= 'Connection: close' . PHP_EOL;
-        $send .= PHP_EOL;
-        $send .= $postdata . PHP_EOL . PHP_EOL;
-
-        //$fp = fsockopen('ssl://' . $hestia_host, $hestia_port);
-        $errno = "";
-        $errstr = "";
-        $context = stream_context_create();
-
-        $result = stream_context_set_option($context, 'ssl', 'verify_peer', false);
-        $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
-        $result = stream_context_set_option($context, 'ssl', 'verify_host', false);
-        $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
-
-        $fp = stream_socket_client('ssl://' . $hestia_host . ':'.$hestia_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context);
-        fputs($fp, $send);
-        $result = fread($fp, 2048);
-        fclose($fp);
-
-        $fp = fopen("/tmp/roundcube.log", 'w');
-        fwrite($fp, "test ok");
-        fwrite($fp, "\n");
-        fclose($fp);
-
-
-        if(strpos($result, 'ok') && !strpos($result, 'error'))
-        {
-            return PASSWORD_SUCCESS;
-        }
-        else {
-            return PASSWORD_ERROR;
-        }
-
-    }
-}

+ 0 - 850
install/rpm/roundcube/main.inc.php

@@ -1,850 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | Main configuration file                                               |
- |                                                                       |
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2011, 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();
-
-// ----------------------------------
-// LOGGING/DEBUGGING
-// ----------------------------------
-
-// system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace
-$rcmail_config['debug_level'] = 1;
-
-// log driver:  'syslog' or 'file'.
-$rcmail_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';
-
-// Syslog ident string to use, if using the 'syslog' log driver.
-$rcmail_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;
-
-// Log sent messages to <log_dir>/sendmail or to syslog
-$rcmail_config['smtp_log'] = true;
-
-// Log successful logins to <log_dir>/userlogins or to syslog
-$rcmail_config['log_logins'] = false;
-
-// Log session authentication errors to <log_dir>/session or to syslog
-$rcmail_config['log_session'] = false;
-
-// Log SQL queries to <log_dir>/sql or to syslog
-$rcmail_config['sql_debug'] = false;
-
-// Log IMAP conversation to <log_dir>/imap or to syslog
-$rcmail_config['imap_debug'] = false;
-
-// Log LDAP conversation to <log_dir>/ldap or to syslog
-$rcmail_config['ldap_debug'] = false;
-
-// Log SMTP conversation to <log_dir>/smtp or to syslog
-$rcmail_config['smtp_debug'] = false;
-
-// ----------------------------------
-// IMAP
-// ----------------------------------
-
-// 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 - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
-// %s - domain name after the '@' from e-mail address provided at login screen
-// For example %n = mail.domain.tld, %d = domain.tld
-$rcmail_config['default_host'] = 'tls://localhost';
-
-// TCP port used for IMAP connections
-$rcmail_config['default_port'] = 993;
-
-// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
-// best server supported one)
-$rcmail_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;
-
-// 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
-// set these options. All can be strings or arrays of strings.
-// 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;
-
-// 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;
-
-// 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.
-$rcmail_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;
-
-// IMAP connection timeout, in seconds. Default: 0 (no limit)
-$rcmail_config['imap_timeout'] = 0;
-
-// Optional IMAP authentication identifier to be used as authorization proxy
-$rcmail_config['imap_auth_cid'] = null;
-
-// Optional IMAP authentication password to be used for imap_auth_cid
-$rcmail_config['imap_auth_pw'] = null;
-
-// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'.
-$rcmail_config['imap_cache'] = null;
-
-// Enables messages cache. Only 'db' cache is supported.
-$rcmail_config['messages_cache'] = false;
-
-
-// ----------------------------------
-// SMTP
-// ----------------------------------
-
-// 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 - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
-// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
-$rcmail_config['smtp_server'] = 'tls://localhost';
-
-// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
-// deprecated SSL over SMTP (aka SMTPS))
-$rcmail_config['smtp_port'] = 587;
-
-// SMTP username (if required) if you use %u as the username Roundcube
-// will use the current username for login
-$rcmail_config['smtp_user'] = '%u';
-
-// 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'] = '%p';
-
-// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
-// best server supported one)
-$rcmail_config['smtp_auth_type'] = '';
-
-// Optional SMTP authentication identifier to be used as authorization proxy
-$rcmail_config['smtp_auth_cid'] = null;
-
-// Optional SMTP authentication password to be used for smtp_auth_cid
-$rcmail_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'] = '';
-
-// SMTP connection timeout, in seconds. Default: 0 (no limit)
-$rcmail_config['smtp_timeout'] = 0;
-
-// ----------------------------------
-// SYSTEM
-// ----------------------------------
-include_once("/etc/roundcube/db.inc.php");
-
-
-// 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;
-
-// 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'] = '';
-
-// replace Roundcube logo with this image
-// specify an URL relative to the document root of this Roundcube installation
-$rcmail_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;
-
-// 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'] = '/var/log/roundcube/';
-
-// use this folder to store temp files (must be writeable for apache user)
-$rcmail_config['temp_dir'] = '/tmp';
-
-// lifetime of message cache
-// possible units: s, m, h, d, w
-$rcmail_config['message_cache_lifetime'] = '1d';
-
-// 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;
-
-// 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;
-
-// Allow browser-autocompletion on login form.
-// 0 - disabled, 1 - username and host only, 2 - username, host, password
-$rcmail_config['login_autocomplete'] = 1;
-
-// Forces conversion of logins to lower case.
-// 0 - disabled, 1 - only domain part, 2 - domain and local part.
-// If users authentication is not case-sensitive this must be enabled.
-// 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;
-
-// Includes should be interpreted as PHP files
-$rcmail_config['skin_include_php'] = false;
-
-// display software version on login screen
-$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
-$rcmail_config['session_domain'] = '';
-
-// session name. Default: 'roundcube_sessid'
-$rcmail_config['session_name'] = null;
-
-// Backend to use for session storage. Can either be 'db' (default) or 'memcache'
-// 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
-$rcmail_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/sock.file
-$rcmail_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;
-
-// check referer of incoming requests
-$rcmail_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';
-
-// 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'] = '%des_key%';
-
-// Automatically add this domain to user names for login
-// Only for IMAP servers that require full e-mail addresses for login
-// Specify an array with 'host' => 'domain' values to support multiple hosts
-// Supported replacement variables:
-// %h - user's IMAP hostname
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
-// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
-$rcmail_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
-// Supported replacement variables:
-// %h - user's IMAP hostname
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
-// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
-$rcmail_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';
-
-// How many seconds must pass between emails sent by a user
-$rcmail_config['sendmail_delay'] = 0;
-
-// Maximum number of recipients per message. Default: 0 (no limit)
-$rcmail_config['max_recipients'] = 100;
-
-// 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'] = 100;
-
-// add this user-agent to message headers when sending
-$rcmail_config['useragent'] = 'Roundcube Webmail';
-
-// use this name to compose page titles
-$rcmail_config['product_name'] = 'Roundcube Webmail';
-
-// try to load host-specific configuration
-// see http://trac.roundcube.net/wiki/Howto_Config for more details
-$rcmail_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'] = '';
-
-// 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'] = '';
-
-// add a received header to outgoing mails containing the creators IP and hostname
-$rcmail_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;
-
-// 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;
-
-// number of chars allowed for line when wrapping text.
-// text wrapping is done when composing/sending messages
-$rcmail_config['line_length'] = 72;
-
-// send plaintext messages as format=flowed
-$rcmail_config['send_format_flowed'] = true;
-
-// don't allow these settings to be overriden by the user
-$rcmail_config['dont_override'] = array();
-
-// Set identities access level:
-// 0 - many identities with possibility to edit all params
-// 1 - many identities with possibility to edit all params but not email address
-// 2 - one identity with possibility to edit all params
-// 3 - one identity with possibility to edit all params but not email address
-$rcmail_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
-
-// mime magic database
-$rcmail_config['mime_magic'] = null;
-
-// path to imagemagick identify binary
-$rcmail_config['im_identify_path'] = null;
-
-// path to imagemagick convert binary
-$rcmail_config['im_convert_path'] = null;
-
-// maximum size of uploaded contact photos in pixel
-$rcmail_config['contact_photo_size'] = 160;
-
-// Enable DNS checking for e-mail address validation
-$rcmail_config['email_dns_check'] = false;
-
-// ----------------------------------
-// PLUGINS
-// ----------------------------------
-
-// List of active plugins (in plugins/ directory)
-$rcmail_config['plugins'] = array('password');
-
-// ----------------------------------
-// USER INTERFACE
-// ----------------------------------
-
-// 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'] = '';
-
-// default messages sort order
-$rcmail_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');
-
-// 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;
-
-// use this format for date display (date or strftime format)
-$rcmail_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');
-
-// use this format for time display (date or strftime format)
-$rcmail_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');
-
-// use this format for short date display (derived from date_format and time_format)
-$rcmail_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';
-
-// 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';
-
-// store spam messages in this mailbox
-// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['junk_mbox'] = 'Spam';
-
-// 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';
-
-// 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';
-
-// 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', 'Spam', 'Trash');
-$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash');
-
-// automatically create the above listed default folders on first login
-$rcmail_config['create_default_folders'] = true;
-
-// protect the default folders from renames, deletes, and subscription changes
-$rcmail_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'] = true;
-
-// 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;
-
-// Enables spellchecker exceptions dictionary.
-// Setting it to 'shared' will make the dictionary shared by all users.
-$rcmail_config['spellcheck_dictionary'] = false;
-
-// Set the spell checking engine. 'googie' is the default. 'pspell' is also available,
-// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here.
-$rcmail_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'] = '';
-
-// 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;
-
-// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE)
-$rcmail_config['spellcheck_ignore_caps'] = false;
-
-// Makes that words with numbers will be ignored (e.g. g00gle)
-$rcmail_config['spellcheck_ignore_nums'] = false;
-
-// Makes that words with symbols will be ignored (e.g. g@@gle)
-$rcmail_config['spellcheck_ignore_syms'] = false;
-
-// Use this char/string to separate recipients when composing a new message
-$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;
-
-// 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;
-
-// 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'] = 10;
-
-// ----------------------------------
-// ADDRESSBOOK SETTINGS
-// ----------------------------------
-
-// This indicates which type of address book to use. Possible choises:
-// 'sql' (default) and 'ldap'.
-// If set to 'ldap' then it will look at using the first writable LDAP
-// address book as the primary address book and it will not display the
-// SQL address book in the 'Address Book' view.
-$rcmail_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();
-
-// 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.
-//
-// The recommended directory structure for LDAP is to store all the address book entries
-// under the users main entry, e.g.:
-//
-//  o=root
-//   ou=people
-//    uid=user@domain
-//  mail=contact@contactdomain
-//
-// So the base_dn would be uid=%fu,ou=people,o=root
-// The bind_dn would be the same as based_dn or some super user login.
-/* 
- * example config for Verisign directory
- *
-$rcmail_config['ldap_public']['Verisign'] = array(
-  'name'          => 'Verisign.com',
-  // Replacement variables supported in host names:
-  // %h - user's IMAP hostname
-  // %n - http hostname ($_SERVER['SERVER_NAME'])
-  // %d - domain (http hostname without the first part)
-  // %z - IMAP domain (IMAP hostname without the first part)
-  // For example %n = mail.domain.tld, %d = domain.tld
-  'hosts'         => array('directory.verisign.com'),
-  'port'          => 389,
-  'use_tls'	      => false,
-  'ldap_version'  => 3,       // using LDAPv3
-  'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
-  // %fu - The full username provided, assumes the username is an email
-  //       address, uses the username_domain value if not an email address.
-  // %u  - The username prior to the '@'.
-  // %d  - The domain name after the '@'.
-  // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
-  // %dn - DN found by ldap search when search_filter/search_base_dn are used
-  'base_dn'       => '',
-  'bind_dn'       => '',
-  'bind_pass'     => '',
-  // It's possible to bind for an individual address book
-  // The login name is used to search for the DN to bind with
-  'search_base_dn' => '',
-  'search_filter'  => '',   // e.g. '(&(objectClass=posixAccount)(uid=%u))'
-  // DN and password to bind as before searching for bind DN, if anonymous search is not allowed
-  'search_bind_dn' => '',
-  'search_bind_pw' => '',
-  // Default for %dn variable if search doesn't return DN value
-  'search_dn_default' => '',
-  // Optional authentication identifier to be used as SASL authorization proxy
-  // bind_dn need to be empty
-  'auth_cid'       => '',
-  // SASL authentication method (for proxy auth), e.g. DIGEST-MD5
-  'auth_method'    => '',
-  // Indicates if the addressbook shall be hidden from the list.
-  // With this option enabled you can still search/view contacts.
-  'hidden'        => false,
-  // Indicates if the addressbook shall not list contacts but only allows searching.
-  'searchonly'    => false,
-  // Indicates if we can write to the LDAP directory or not.
-  // If writable is true then these fields need to be populated:
-  // LDAP_Object_Classes, required_fields, LDAP_rdn
-  'writable'       => false,
-  // To create a new contact these are the object classes to specify
-  // (or any other classes you wish to use).
-  'LDAP_Object_Classes' => array('top', 'inetOrgPerson'),
-  // The RDN field that is used for new entries, this field needs
-  // to be one of the search_fields, the base of base_dn is appended
-  // to the RDN to insert into the LDAP directory.
-  'LDAP_rdn'       => 'cn',
-  // The required fields needed to build a new contact as required by
-  // the object classes (can include additional fields not required by the object classes).
-  'required_fields' => array('cn', 'sn', 'mail'),
-  'search_fields'   => array('mail', 'cn'),  // fields to search in
-  // mapping of contact fields to directory attributes
-  //   for every attribute one can specify the number of values (limit) allowed.
-  //   default is 1, a wildcard * means unlimited
-  'fieldmap' => array(
-    // Roundcube  => LDAP:limit
-    'name'        => 'cn',
-    'surname'     => 'sn',
-    'firstname'   => 'givenName',
-    'title'       => 'title',
-    'email'       => 'mail:*',
-    'phone:home'  => 'homePhone',
-    'phone:work'  => 'telephoneNumber',
-    'phone:mobile' => 'mobile',
-    'phone:pager' => 'pager',
-    'street'      => 'street',
-    'zipcode'     => 'postalCode',
-    'region'      => 'st',
-    'locality'    => 'l',
-// if you uncomment country, you need to modify 'sub_fields' above
-//    'country'     => 'c',
-    'department'  => 'departmentNumber',
-    'notes'       => 'description',
-// these currently don't work:
-//    'phone:workfax' => 'facsimileTelephoneNumber',
-//    'photo'        => 'jpegPhoto',
-//    'organization' => 'o',
-//    'manager'      => 'manager',
-//    'assistant'    => 'secretary',
-  ),
-  // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country'
-  'sub_fields' => array(),
-  '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
-  'fuzzy_search'  => true,    // server allows wildcard search
-  'vlv'           => false,   // Enable Virtual List View to more efficiently fetch paginated data (if server supports it)
-  'numsub_filter' => '(objectClass=organizationalUnit)',   // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting
-  'sizelimit'     => '0',     // Enables you to limit the count of entries fetched. Setting this to 0 means no limit.
-  'timelimit'     => '0',     // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit.
-  'referrals'     => true|false,  // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups
-
-  // definition for contact groups (uncomment if no groups are supported)
-  // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above)
-  // if the groups base_dn is empty, the contact base_dn is used for the groups as well
-  // -> in this case, assure that groups and contacts are separated due to the concernig filters! 
-  'groups'        => array(
-    'base_dn'     => '',
-    'scope'       => 'sub',   // search mode: sub|base|list
-    'filter'      => '(objectClass=groupOfNames)',
-    'object_classes' => array("top", "groupOfNames"),
-    'member_attr'  => 'member',   // name of the member attribute, e.g. uniqueMember
-    'name_attr'    => 'cn',       // attribute to be used as group name
-  ),
-);
-*/
-
-// 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');
-
-// 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;
-
-// 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;
-
-// Max. numer of entries in autocomplete popup. Default: 15.
-$rcmail_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}';
-
-// 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;
-
-// ----------------------------------
-// USER PREFERENCES
-// ----------------------------------
-
-// Use this charset as fallback for message decoding
-//$rcmail_config['default_charset'] = 'ISO-8859-1';
-$rcmail_config['default_charset'] = 'UTF-8';
-
-// skin name: folder from skins/
-$rcmail_config['skin'] = 'larry';
-
-// show up to X items in messages list view
-$rcmail_config['mail_pagesize'] = 200;
-
-// show up to X items in contacts list view
-$rcmail_config['addressbook_pagesize'] = 200;
-
-// sort contacts by this col (preferably either one of name, firstname, surname)
-$rcmail_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;
-
-// 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';
-
-// prefer displaying HTML messages
-$rcmail_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;
-
-// compose html formatted messages by default
-// 0 - never, 1 - always, 2 - on reply to HTML message only 
-$rcmail_config['htmleditor'] = 0;
-
-// show pretty dates as standard
-$rcmail_config['prettydate'] = true;
-
-// save compose message every 30 seconds
-$rcmail_config['draft_autosave'] = 30;
-
-// default setting if preview pane is enabled
-$rcmail_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;
-
-// Clear Trash on logout
-$rcmail_config['logout_purge'] = false;
-
-// Compact INBOX on logout
-$rcmail_config['logout_expunge'] = true;
-
-// Display attached images below the message body 
-$rcmail_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;
-
-// Set true if deleted messages should not be displayed
-// This will make the application run slower
-$rcmail_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;
-
-// Set to true to never delete messages immediately
-// 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;
-
-// If true all folders will be checked for recent messages
-$rcmail_config['check_all_folders'] = true;
-
-// If true, after message delete/move, the next message will be displayed
-$rcmail_config['display_next'] = false;
-
-// 0 - Do not expand threads 
-// 1 - Expand all threads automatically 
-// 2 - Expand only threads with unread messages 
-$rcmail_config['autoexpand_threads'] = 0;
-
-// When replying place cursor above original message (top posting)
-$rcmail_config['top_posting'] = true;
-
-// When replying strip original signature from message
-$rcmail_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;
-
-// When replying or forwarding place sender's signature above existing message
-$rcmail_config['sig_above'] = false;
-
-// Use MIME encoding (quoted-printable) for 8bit characters in message body
-$rcmail_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));
-
-// Defaults of the addressbook search field configuration.
-$rcmail_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'] = true;
-
-// Directly delete messages in Junk instead of moving to Trash
-$rcmail_config['delete_junk'] = true;
-
-// 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;
-
-// Return receipt checkbox default state
-$rcmail_config['mdn_default'] = 0;
-
-// Delivery Status Notification checkbox default state
-$rcmail_config['dsn_default'] = 0;
-
-// Place replies in the folder of the message being replied to
-$rcmail_config['reply_same_folder'] = false;
-
-// Sets default mode of Forward feature to "forward as attachment"
-$rcmail_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;
-
-// Enables spell checking before sending a message.
-$rcmail_config['spellcheck_before_send'] = false;
-
-// Skip alternative email addresses in autocompletion (show one address per contact)
-$rcmail_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'] = '';
-
-// end of config file

+ 0 - 15
install/rpm/roundcube/plugins/config_newmail_notifier.inc.php

@@ -1,15 +0,0 @@
-<?php
-
-// Enables basic notification
-$config['newmail_notifier_basic'] = true;
-
-// Enables sound notification
-$config['newmail_notifier_sound'] = false;
-
-// Enables desktop notification
-$config['newmail_notifier_desktop'] = false;
-
-// Desktop notification close timeout in seconds
-$config['newmail_notifier_desktop_timeout'] = 5;
-
-?>

+ 0 - 21
install/rpm/roundcube/plugins/config_zipdownload.inc.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * ZipDownload configuration file
- */
-
-// Zip attachments
-// Only show the link when there are more than this many attachments
-// -1 to prevent downloading of attachments as zip
-$config['zipdownload_attachments'] = 1;
-
-// Zip selection of mail messages
-// This option enables downloading of multiple messages as one zip archive.
-// The number or string value specifies maximum total size of all messages
-// in the archive (not the size of the archive itself).
-$config['zipdownload_selection'] = '100MB';
-
-// Charset to use for filenames inside the zip
-$config['zipdownload_charset'] = 'ISO-8859-1';
-
-?>

+ 1 - 1
install/upgrade/upgrade.conf

@@ -40,7 +40,7 @@ pma_v='5.2.0'
 
 # Set version of RoundCube (Webmail) to update during upgrade if not already installed
 # Note: only applies to "non-apt installs >= 1.4.0 or manually phased out"
-rc_v='1.5.3'
+rc_v='1.6.0'
 
 # Set version of Rainloop (Webmail) to update during upgrade if not already installed
 rl_v='1.16.0'

+ 1 - 10
install/upgrade/versions/1.6.5.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Hestia Control Panel upgrade script for target version 1.6.4
+# Hestia Control Panel upgrade script for target version 1.6.6
 
 #######################################################################################
 #######                      Place additional commands below.                   #######
@@ -20,12 +20,3 @@ upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'no'
 upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'no'
 upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
-
-#Add phpquoteshellarg as dependency
-if [ "$FILE_MANAGER" = "true" ]; then
-    $HESTIA/bin/v-delete-sys-filemanager quiet
-    $HESTIA/bin/v-delete-sys-filemanager quiet
-fi
-
-$HESTIA/bin/v-add-sys-phpmailer
-

+ 30 - 0
install/upgrade/versions/1.6.6.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.6.4
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+####### Pass through information to the end user in case of a issue or problem  #######
+#######                                                                         #######
+####### Use add_upgrade_message "My message here" to include a message          #######
+####### in the upgrade notification email. Example:                             #######
+#######                                                                         #######
+####### add_upgrade_message "My message here"                                   #######
+#######                                                                         #######
+####### You can use \n within the string to create new lines.                   #######
+#######################################################################################
+
+upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'no'
+upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
+
+if [ -f "/etc/roundcube/config.inc.php" ]; then
+    if [ -n "$(grep 'ssl://localhost' /etc/roundcube/config.inc.php)" ]; then
+        # Echo prepare for 1.6.0 update
+        sed -i "s|ssl://localhost|localhost|g" /etc/roundcube/config.inc.php
+        sed -i "s|993|143|g" /etc/roundcube/config.inc.php
+    fi
+fi