Fix SQL syntax error on MariaDB 10.2 (#5774) (#6833)

Backported from 1.3 release to the 1.1 LTS release.

.htaccess

@@ -31,7 +31,7 @@ RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
 # security rules:
 # - deny access to files not containing a dot or starting with a dot
 #   in all locations except installer directory
-RewriteRule ^(?!installer|[a-f0-9]{16})(\.?[^\.]+)$ - [F]
+RewriteRule ^(?!installer|\.well-known\/|[a-f0-9]{16})(\.?[^\.]+)$ - [F]
 # - deny access to some locations
 RewriteRule ^/?(\.git|\.tx|SQL|bin|config|logs|temp|tests|program\/(include|lib|localization|steps)) - [F]
 # - deny access to some documentation files

INSTALL

@@ -11,15 +11,15 @@ REQUIREMENTS
 
 * The Apache, Lighttpd, Cherokee or Hiawatha web server
 * .htaccess support allowing overrides for DirectoryIndex
-* PHP Version 5.3.7 or greater including
+* PHP Version 5.3.7 or greater (but not PHP 7) including
    - PCRE, DOM, JSON, Session, Sockets (required)
    - PHP Data Objects (PDO) with driver for either MySQL, PostgreSQL or SQLite (required)
    - Libiconv, Zip (recommended)
    - OpenSSL, Fileinfo, Mcrypt, mbstring (optional)
 * PEAR packages distributed with Roundcube or external:
-   - Mail_Mime 1.8.1 or newer
-   - Mail_mimeDecode 1.5.5 or newer
-   - Net_SMTP (latest from https://github.com/pear/Net_SMTP/)
+   - Mail_Mime 1.9.0 or newer
+   - Net_SMTP 1.7.1 or newer
+   - Net_Socket 1.0.12 or newer
    - Net_IDNA2 0.1.1 or newer
    - Auth_SASL 1.0.6 or newer
    - Net_Sieve 1.3.2 or newer (for managesieve plugin)
@@ -153,6 +153,29 @@ increase the allowed size of file attachments, for example:
 	php_value       upload_max_filesize     2M
 
 
+SECURE YOUR INSTALLATION
+========================
+
+Access through the webserver to the following directories should be denied:
+
+  /config
+  /temp
+  /logs
+
+Roundcube uses .htaccess files to protect these directories, so be sure to
+allow override of the Limit directives to get them taken into account. The
+package also ships a .htaccess file in the root directory which defines some
+rewrite rules. In order to properly secure your installation, please enable
+mod_rewrite for Apache webserver and double check access to the above listed
+directories and their contents is denied.
+
+NOTE: In Apache 2.4, support for .htaccess files has been disabled by
+default. Therefore you first need to enable this in your Apache main or
+virtual host config by with:
+
+ AllowOverride all
+
+
 UPGRADING
 =========
 

README.md

@@ -80,8 +80,8 @@ For more information visit [roundcube.net/contribute][contrib]
 
 CONTACT
 -------
-For any bug reports or feature requests please refer to the tracking system
-at [trac.roundcube.net][tracreport] or subscribe to our mailing list.
+For bug reports or feature requests please refer to the tracking system
+at [Github][githubissues] or subscribe to our mailing list.
 See [roundcube.net/support][support] for details.
 
 You're always welcome to send a message to the project admin:
@@ -98,4 +98,4 @@ hello(at)roundcube(dot)net
 [license]:      http://roundcube.net/license
 [contrib]:      http://roundcube.net/contribute
 [support]:      http://roundcube.net/support
-[tracreport]:   http://trac.roundcube.net/wiki/Howto_ReportIssues
+[githubissues]: https://github.com/roundcube/roundcubemail/issues

SQL/mssql.initial.sql

@@ -393,6 +393,6 @@ CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]
     WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)
 GO
 
-INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2014042900')
+INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2015030800')
 GO
 

SQL/mssql/2015030800.sql

@@ -0,0 +1 @@
+-- empty

SQL/mysql.initial.sql

@@ -162,7 +162,7 @@ CREATE TABLE `identities` (
  `email` varchar(128) NOT NULL,
  `reply-to` varchar(128) NOT NULL DEFAULT '',
  `bcc` varchar(128) NOT NULL DEFAULT '',
- `signature` text,
+ `signature` longtext,
  `html_signature` tinyint(1) NOT NULL DEFAULT '0',
  PRIMARY KEY(`identity_id`),
  CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
@@ -209,4 +209,4 @@ CREATE TABLE `system` (
 
 /*!40014 SET FOREIGN_KEY_CHECKS=1 */;
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800');

SQL/mysql/2015030800.sql

@@ -0,0 +1 @@
+ALTER TABLE `identities` CHANGE `signature` `signature` longtext;

SQL/oracle.initial.sql

@@ -218,4 +218,4 @@ CREATE TABLE "system" (
     "value" long
 );
 
-INSERT INTO "system" ("name", "value") VALUES ('roundcube-version', '2014042900');
+INSERT INTO "system" ("name", "value") VALUES ('roundcube-version', '2015030800');

SQL/oracle/2015030800.sql

@@ -0,0 +1 @@
+-- empty

SQL/postgres.initial.sql

@@ -290,4 +290,4 @@ CREATE TABLE "system" (
     value text
 );
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800');

SQL/postgres/2015030800.sql

@@ -0,0 +1 @@
+-- empty

SQL/sqlite.initial.sql

@@ -201,4 +201,4 @@ CREATE TABLE system (
   value text NOT NULL
 );
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800');

SQL/sqlite/2015030800.sql

@@ -0,0 +1 @@
+-- empty

UPGRADING

@@ -41,15 +41,22 @@ it on a unix system, you need to do the following operations by hand:
    ./skins/
    ./plugins/
    ./vendor/
-4. Run `./bin/update.sh` from the commandline OR
+4a. If you previously installed plugins through composer, update dependencies
+   by running `php composer.phar update --no-dev`
+4b. Install/update dependencies using composer:
+   - get composer from https://getcomposer.org/download/
+   - rename the composer.json-dist file into composer.json
+   - if you want to use LDAP address books, enable the LDAP libraries in your
+     composer.json file by moving the items from "suggest" to the "require"
+     section (remove the explanation texts after the version!).
+   - run `php composer.phar install --no-dev`
+5. Run `./bin/update.sh` from the commandline OR
    open http://url-to-roundcube/installer/ in a browser and choose "3 Test config".
    To enable the latter one, you have to temporary set 'enable_installer'
    to true in your local config/config.inc.php file.
    WARNING: See SQLite database upgrade below.
-5. Let the update script/installer check your configuration and
+6. Let the update script/installer check your configuration and
    update your config files and database schema as suggested by the updater.
-5. If you previously installed plugins through composer, update dependencies
-   by running `php composer.phar update --no-dev`
 7. Make sure 'enable_installer' is set to false again.
 8. See Post-Upgrade Activities section.
 

bin/gc.sh

@@ -24,4 +24,16 @@ define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
 require INSTALL_PATH.'program/include/clisetup.php';
 
 $rcmail = rcube::get_instance();
+
+$session_driver   = $rcmail->config->get('session_storage', 'db');
+$session_lifetime = $rcmail->config->get('session_lifetime', 0) * 60 * 2;
+
+// Clean expired SQL sessions
+if ($session_driver == 'db' && $session_lifetime) {
+    $db = $rcmail->get_dbh();
+    $db->query("DELETE FROM " . $db->table_name('session')
+        . " WHERE changed < " . $db->now(-$session_lifetime));
+}
+
+// Clean caches and temp directory
 $rcmail->gc();

bin/installto.sh

@@ -60,6 +60,8 @@ if (strtolower($input) == 'y') {
       break;
     }
   }
+  // remove old (<1.0) .htaccess file
+  @unlink("$target_dir/program/.htaccess");
   echo "done.\n\n";
 
   if (is_dir("$target_dir/skins/default")) {

bin/moduserprefs.sh

@@ -71,7 +71,7 @@ while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
 	$prefs[$pref_name] = $pref_value;
 
 	if ($prefs != $old_prefs) {
-		$user->save_prefs($prefs);
+		$user->save_prefs($prefs, true);
 		echo "saved.\n";
 	}
 	else {

bin/update.sh

@@ -5,7 +5,7 @@
  | bin/update.sh                                                         |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2010-2014, The Roundcube Dev Team                       |
+ | Copyright (C) 2010-2015, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -188,18 +188,24 @@ if ($RCI->configured) {
       }
 
       foreach ($composer_template['repositories'] as $repo) {
-        $rkey = $repo['type'] . $repo['url'] . $repo['package']['name'];
+        $rkey = $repo['type'] . preg_replace('/^https?:/', '', $repo['url']) . $repo['package']['name'];
         $existing = false;
-        foreach ($composer_data['repositories'] as $_repo) {
-          if ($rkey == $_repo['type'] . $_repo['url'] . $_repo['package']['name']) {
+        foreach ($composer_data['repositories'] as $k =>  $_repo) {
+          if ($rkey == $_repo['type'] . preg_replace('/^https?:/', '', $_repo['url']) . $_repo['package']['name']) {
             $existing = true;
             break;
           }
+          // remove old repos
+          else if (strpos($_repo['url'], 'git://git.kolab.org') === 0) {
+              unset($composer_data['repositories'][$k]);
+          }
         }
         if (!$existing) {
           $composer_data['repositories'][] = $repo;
         }
       }
+
+      $composer_data['repositories'] = array_values($composer_data['repositories']);
     }
 
     // use the JSON encoder from the Composer package
@@ -209,7 +215,7 @@ if ($RCI->configured) {
     }
     // PHP 5.4's json_encode() does the job, too
     else if (defined('JSON_PRETTY_PRINT')) {
-      $comsposer_json = json_encode($composer_data, JSON_PRETTY_PRINT & JSON_UNESCAPED_SLASHES);
+      $comsposer_json = json_encode($composer_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
     }
     else {
       $success = false;

composer.json-dist

@@ -5,46 +5,34 @@
     "repositories": [
         {
             "type": "pear",
-            "url": "http://pear.php.net/"
+            "url": "https://pear.php.net/"
         },
         {
             "type": "composer",
-            "url": "http://plugins.roundcube.net/"
+            "url": "https://plugins.roundcube.net/"
         },
         {
             "type": "vcs",
-            "url": "git://git.kolab.org/git/pear/Net_LDAP3"
-        },
-        {
-            "type": "package",
-            "package": {
-                "name": "Net_SMTP",
-                "version": "dev-master",
-                "source": {
-                    "url": "http://github.com/pear/Net_SMTP",
-                    "type": "git",
-                    "reference": "master"
-                }
-            }
+            "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
         }
     ],
     "require": {
         "php": ">=5.3.7",
-        "roundcube/plugin-installer": ">=0.1.5",
-        "pear/mail_mime": ">=1.8.9",
-        "pear/mail_mime-decode": ">=1.5.5",
-        "pear/net_smtp": "dev-master",
-        "pear-pear.php.net/auth_sasl": ">=1.0.6",
-        "pear-pear.php.net/net_idna2": ">=0.1.1",
-        "pear-pear.php.net/net_sieve": ">=1.3.2",
-        "patchwork/utf8": "1.2.x"
+        "roundcube/plugin-installer": "~0.1.6",
+        "pear-pear.php.net/net_socket": "~1.0.12",
+        "pear-pear.php.net/auth_sasl": "~1.0.6",
+        "pear-pear.php.net/net_idna2": "~0.1.1",
+        "pear-pear.php.net/net_sieve": "~1.3.4",
+        "pear-pear.php.net/mail_mime": "~1.9.0",
+        "pear-pear.php.net/net_smtp": "~1.7.1",
+        "patchwork/utf8": "~1.2.3"
     },
     "require-dev": {
         "pear-pear.php.net/crypt_gpg": "*",
         "phpunit/phpunit": "*"
     },
     "suggest": {
-        "pear-pear.php.net/net_ldap2": ">=2.0.12 required for connecting to LDAP address books",
+        "pear-pear.php.net/net_ldap2": "~2.1.0 required for connecting to LDAP address books",
         "kolab/Net_LDAP3": "dev-master required for connecting to LDAP address books"
     },
     "minimum-stability": "dev"

config/.htaccess

@@ -0,0 +1,7 @@
+# deny webserver access to this directory
+<ifModule mod_authz_core.c>
+    Require all denied
+</ifModule>
+<ifModule !mod_authz_core.c>
+    Deny from all
+</ifModule>

config/defaults.inc.php

@@ -51,6 +51,12 @@ $config['db_table_dsn'] = array(
 //    'cache_messages' => 'r',
 );
 
+// It is possible to specify database variable values e.g. some limits here.
+// Use them if your server is not MySQL or for better performance.
+// For example Roundcube uses max_allowed_packet value (in bytes)
+// which limits query size for database cache operations.
+$config['db_max_allowed_packet'] = null;
+
 
 // ----------------------------------
 // LOGGING/DEBUGGING
@@ -930,6 +936,10 @@ $config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {
 // Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode
 $config['addressbook_search_mode'] = 0;
 
+// List of fields used on contacts list and for autocompletion searches
+// Warning: These are field names not LDAP attributes (see 'fieldmap' setting)!
+$config['contactlist_fields'] = array('name', 'firstname', 'surname', 'email');
+
 // Template of contact entry on the autocompletion list.
 // You can use contact fields as: name, email, organization, department, etc.
 // See program/steps/addressbook/func.inc for a list
@@ -958,11 +968,11 @@ $config['addressbook_pagesize'] = 50;
 // sort contacts by this col (preferably either one of name, firstname, 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)
+// The way how contact names are displayed in the list.
+// 0: prefix firstname middlename surname suffix (only if display name is not set)
+// 1: firstname middlename surname
+// 2: surname firstname middlename
+// 3: surname, firstname middlename
 $config['addressbook_name_listing'] = 0;
 
 // use this timezone to display date/time
@@ -1068,6 +1078,11 @@ $config['strip_existing_sig'] = true;
 // 3 - Forwards and Replies only
 $config['show_sig'] = 1;
 
+// By default the signature is placed depending on cursor position (reply_mode).
+// Sometimes it might be convenient to start the reply on top but keep
+// the signature below the quoted text (sig_below = true).
+$config['sig_below'] = false;
+
 // Use MIME encoding (quoted-printable) for 8bit characters in message body
 $config['force_7bit'] = false;
 

index.php

@@ -2,9 +2,9 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 1.1.0                                                           |
+ | Version 1.1.12                                                          |
  |                                                                         |
- | Copyright (C) 2005-2015, The Roundcube Dev Team                         |
+ | Copyright (C) 2005-2016, The Roundcube Dev Team                         |
  |                                                                         |
  | This program is free software: you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License (with exceptions   |
@@ -131,7 +131,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
 
             // prevent redirect to compose with specified ID (#1488226)
             if ($query['_action'] == 'compose' && !empty($query['_id'])) {
-                $query = array();
+                $query = array('_action' => 'compose');
             }
         }
 

installer/check.php

@@ -34,7 +34,6 @@ $required_libs = array(
     'Net_SMTP'  => 'pear.php.net',
     'Net_IDNA2' => 'pear.php.net',
     'Mail_mime' => 'pear.php.net',
-    'Mail_mimeDecode' => 'pear.php.net',
 );
 
 $optional_libs = array(
@@ -82,9 +81,8 @@ $source_urls = array(
     'PEAR'      => 'http://pear.php.net',
     'Net_SMTP'  => 'http://pear.php.net/package/Net_SMTP',
     'Mail_mime' => 'http://pear.php.net/package/Mail_mime',
-    'Mail_mimeDecode' => 'http://pear.php.net/package/Mail_mimeDecode',
     'Net_IDNA2' => 'http://pear.php.net/package/Net_IDNA2',
-    'Net_LDAP3' => 'http://git.kolab.org/pear/Net_LDAP3',
+    'Net_LDAP3' => 'https://git.kolab.org/diffusion/PNL',
 );
 
 echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) . '" />';
@@ -95,8 +93,14 @@ echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) .
 
 define('MIN_PHP_VERSION', '5.3.7');
 if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) {
-    $RCI->pass('Version', 'PHP ' . PHP_VERSION . ' detected');
-} else {
+    if (PHP_MAJOR_VERSION != 5) {
+        $RCI->fail('Version', 'PHP5 is required, ' . PHP_VERSION . ' detected');
+    }
+    else {
+        $RCI->pass('Version', 'PHP ' . PHP_VERSION . ' detected');
+    }
+}
+else {
     $RCI->fail('Version', 'PHP Version ' . MIN_PHP_VERSION . ' or greater is required ' . PHP_VERSION . ' detected');
 }
 ?>

installer/config.php

@@ -85,7 +85,7 @@ echo $input_support->show($RCI->getprop('support_url'));
 
 ?>
 <div>Provide an URL where a user can get support for this Roundcube installation.<br/>PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!</div>
-<p class="hint">Enter an absolute URL (inculding http://) to a support page/form or a mailto: link.</p>
+<p class="hint">Enter an absolute URL (including http://) to a support page/form or a mailto: link.</p>
 </dd>
 
 <dt class="propname">skin_logo</dt>

installer/index.php

@@ -3,9 +3,9 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail setup tool                                            |
- | Version 1.1.0                                                           |
+ | Version 1.1.12                                                          |
  |                                                                         |
- | Copyright (C) 2009-2015, The Roundcube Dev Team                         |
+ | Copyright (C) 2009-2016, The Roundcube Dev Team                         |
  |                                                                         |
  | This program is free software: you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License (with exceptions   |

installer/test.php

@@ -427,6 +427,7 @@ if (isset($_POST['imaptest']) && !empty($_POST['_host']) && !empty($_POST['_user
   $imap->set_options(array(
     'auth_type' => $RCI->getprop('imap_auth_type'),
     'debug'     => $RCI->getprop('imap_debug'),
+    'socket_options' => $RCI->getprop('imap_conn_options'),
   ));
 
   if ($imap->connect($imap_host, $imap_user, $_POST['_pass'], $imap_port, $imap_ssl)) {

logs/.gitignore

@@ -1 +0,0 @@
-*

logs/.htaccess

@@ -0,0 +1,7 @@
+# deny webserver access to this directory
+<ifModule mod_authz_core.c>
+    Require all denied
+</ifModule>
+<ifModule !mod_authz_core.c>
+    Deny from all
+</ifModule>

plugins/acl/acl.js

@@ -347,9 +347,12 @@ rcube_webmail.prototype.acl_init_form = function(id)
     buttons[this.gettext('save')] = function(e) { me.command('acl-save'); };
     buttons[this.gettext('cancel')] = function(e) { me.command('acl-cancel'); };
 
+    var popup_wrapper = $('<div style="width:480px; min-height:280px"></div>');
+    this.acl_form.appendTo(popup_wrapper).show();
+
     // display it as popup
     this.acl_popup = this.show_popup_dialog(
-        '<div style="width:480px;height:280px">&nbsp;</div>',
+        popup_wrapper,
         id ? this.gettext('acl.editperms') : this.gettext('acl.newuser'),
         buttons,
         {
@@ -365,8 +368,6 @@ rcube_webmail.prototype.acl_init_form = function(id)
         }
     );
 
-    this.acl_form.appendTo(this.acl_popup).show();
-
     if (type == 'user')
         name_input.focus();
     else

plugins/acl/acl.php

@@ -123,7 +123,7 @@ class acl extends rcube_plugin
                     $group_id = is_array($record[$group_field]) ? $record[$group_field][0] : $record[$group_field];
 
                     if ($group) {
-                        $users[] = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group);
+                        $users[] = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group, 'type' => 'group');
                         $keys[]  = $group;
                     }
                 }
@@ -251,6 +251,11 @@ class acl extends rcube_plugin
         // Get supported rights
         $supported = $this->rights_supported();
 
+        // give plugins the opportunity to adjust this list
+        $data = $this->rc->plugins->exec_hook('acl_rights_supported',
+            array('rights' => $supported, 'folder' => $this->mbox, 'labels' => array()));
+        $supported = $data['rights'];
+
         // depending on server capability either use 'te' or 'd' for deleting msgs
         $deleteright = implode(array_intersect(str_split('ted'), $supported));
 
@@ -281,18 +286,22 @@ class acl extends rcube_plugin
             'other' => preg_replace('/[lrswi'.$deleteright.']/', '', implode($supported)),
         );
 
-        foreach ($items as $key => $val) {
+        // give plugins the opportunity to adjust this list
+        $data = $this->rc->plugins->exec_hook('acl_rights_simple',
+            array('rights' => $items, 'folder' => $this->mbox, 'labels' => array(), 'titles' => array()));
+
+        foreach ($data['rights'] as $key => $val) {
             $id = "acl$key";
             $ul .= html::tag('li', null,
                 $input->show('', array(
                     'name' => "acl[$val]", 'value' => $val, 'id' => $id))
-                . html::label(array('for' => $id, 'title' => $this->gettext('longacl'.$key)),
-                    $this->gettext('acl'.$key)));
+                . html::label(array('for' => $id, 'title' => $data['titles'][$key] ?: $this->gettext('longacl'.$key)),
+                    $data['labels'][$key] ?: $this->gettext('acl'.$key)));
         }
 
         $out .= "\n" . html::tag('ul', $attrib, $ul, html::$common_attrib);
 
-        $this->rc->output->set_env('acl_items', $items);
+        $this->rc->output->set_env('acl_items', $data['rights']);
 
         return $out;
     }
@@ -379,6 +388,11 @@ class acl extends rcube_plugin
         // Get supported rights and build column names
         $supported = $this->rights_supported();
 
+        // give plugins the opportunity to adjust this list
+        $data = $this->rc->plugins->exec_hook('acl_rights_supported',
+            array('rights' => $supported, 'folder' => $this->mbox, 'labels' => array()));
+        $supported = $data['rights'];
+
         // depending on server capability either use 'te' or 'd' for deleting msgs
         $deleteright = implode(array_intersect(str_split('ted'), $supported));
 
@@ -398,6 +412,11 @@ class acl extends rcube_plugin
                 'delete' => $deleteright,
                 'other' => preg_replace('/[lrswi'.$deleteright.']/', '', implode($supported)),
             );
+
+            // give plugins the opportunity to adjust this list
+            $data = $this->rc->plugins->exec_hook('acl_rights_simple',
+                array('rights' => $items, 'folder' => $this->mbox, 'labels' => array()));
+            $items = $data['rights'];
         }
 
         // Create the table
@@ -407,7 +426,7 @@ class acl extends rcube_plugin
         // Create table header
         $table->add_header('user', $this->gettext('identifier'));
         foreach (array_keys($items) as $key) {
-            $label = $this->gettext('shortacl'.$key);
+            $label = $data['labels'][$key] ?: $this->gettext('shortacl'.$key);
             $table->add_header(array('class' => 'acl'.$key, 'title' => $label), $label);
         }
 
@@ -720,7 +739,11 @@ class acl extends rcube_plugin
         $config['fieldmap']['uid']  = $uid_field;
 
         // search in UID and name fields
-        $config['search_fields']   = array_values($config['fieldmap']);
+        // $name_field can be in a form of <field>:<modifier> (#1490591)
+        $name_field = preg_replace('/:.*$/', '', $name_field);
+        $search     = array_unique(array($name_field, $uid_field));
+
+        $config['search_fields']   = $search;
         $config['required_fields'] = array($uid_field);
 
         // set search filter

plugins/acl/localization/bg_BG.inc

@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Пълен контрол, включително и
 $labels['longaclread'] = 'Папката може да бъде отворена за четене';
 $labels['longaclwrite'] = 'Писмата могат да бъдат маркирани, записвани или копирани в папката';
 $labels['longacldelete'] = 'Писмата могат да бъдат изтривани';
+$labels['longaclother'] = 'Други права за достъп';
+$labels['ariasummaryacltable'] = 'Списък с права за достъп';
+$labels['arialabelaclactions'] = 'Списък с действия';
+$labels['arialabelaclform'] = 'Форма с права за достъп';
 $messages['deleting'] = 'Изтриване на права за достъп...';
 $messages['saving'] = 'Запазване на права за достъп...';
 $messages['updatesuccess'] = 'Правата за достъп са променени успешно';

plugins/acl/localization/cs_CZ.inc

@@ -38,6 +38,7 @@ $labels['aclt'] = 'Smazat zprávy';
 $labels['acle'] = 'Vyprázdnit';
 $labels['aclx'] = 'Smazat složku';
 $labels['acla'] = 'Spravovat';
+$labels['acln'] = 'Označit zprávy poznámkou';
 $labels['aclfull'] = 'Plný přístup';
 $labels['aclother'] = 'Ostatní';
 $labels['aclread'] = 'Číst';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'Smazat';
 $labels['shortacle'] = 'Vyprázdnit';
 $labels['shortaclx'] = 'Mazat složky';
 $labels['shortacla'] = 'Spravovat';
+$labels['shortacln'] = 'Označit poznámkou';
 $labels['shortaclother'] = 'Ostatní';
 $labels['shortaclread'] = 'Číst';
 $labels['shortaclwrite'] = 'Zapsat';
@@ -73,11 +75,15 @@ $labels['longaclt'] = 'Příznak smazané zprávy může být změněn';
 $labels['longacle'] = 'Zpráva může být smazána';
 $labels['longaclx'] = 'Složka může být smazána nebo přejmenována';
 $labels['longacla'] = 'Přístupová práva složky mohou být změněna';
+$labels['longacln'] = 'Zprávamy sdílené metadata (poznámky) mohou být změněny';
 $labels['longaclfull'] = 'Plný přístup včetně správy složky';
 $labels['longaclread'] = 'Složka může být otevřena pro čtení';
 $labels['longaclwrite'] = 'Zpráva může být označena, napsána nebo zkopírována do složky';
 $labels['longacldelete'] = 'Zprávy mohou být smazány';
+$labels['longaclother'] = 'Jiná přístupová oprávnění';
 $labels['ariasummaryacltable'] = 'Seznam oprávnění';
+$labels['arialabelaclactions'] = 'Seznam akcí';
+$labels['arialabelaclform'] = 'Formulář pro přístupová oprávnění';
 $messages['deleting'] = 'Odstraňuji přístupová práva...';
 $messages['saving'] = 'Ukládám přístupová práva...';
 $messages['updatesuccess'] = 'Přístupová práva byla úspěšně změněna';

plugins/acl/localization/fr_FR.inc

@@ -19,7 +19,7 @@ $labels['sharing'] = 'Partage';
 $labels['myrights'] = 'Droits d\'accès';
 $labels['username'] = 'Utilisateur :';
 $labels['advanced'] = 'Mode avancé';
-$labels['newuser'] = 'Ajouter l\'entrée';
+$labels['newuser'] = 'Ajouter une entrée';
 $labels['editperms'] = 'Modifier les permissions';
 $labels['actions'] = 'Actions des droits d\'accès...';
 $labels['anyone'] = 'Tous les utilisateurs (n\'importe qui)';

plugins/acl/localization/fy_NL.inc

@@ -16,4 +16,8 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 $labels['username'] = 'Brûker:';
+$labels['acldelete'] = 'Fuortsmite';
+$labels['shortacld'] = 'Fuortsmite';
+$labels['shortaclt'] = 'Fuortsmite';
+$labels['shortacldelete'] = 'Fuortsmite';
 ?>

plugins/acl/localization/hu_HU.inc

@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Teljes hozzáférés beleértve a mappák kezelését'
 $labels['longaclread'] = 'A mappa olvasásra megnyitható';
 $labels['longaclwrite'] = 'Az üzenetek megjelölhetök, irhatók és másolhatók ebbe a mappába';
 $labels['longacldelete'] = 'Az üzenetek törölhetőek';
+$labels['longaclother'] = 'Egyébb hozzáférési jogok';
+$labels['ariasummaryacltable'] = 'Hozzáférési jogok listája';
+$labels['arialabelaclactions'] = 'Listázási müveletek';
+$labels['arialabelaclform'] = 'Hozzáférési jogok űrlap';
 $messages['deleting'] = 'Hozzáférési jogok törlése...';
 $messages['saving'] = 'Hozzáférési jogok mentése...';
 $messages['updatesuccess'] = 'A hozzáférési jogok sikeresen módosultak.';

plugins/acl/localization/it_IT.inc

@@ -47,7 +47,7 @@ $labels['acldelete'] = 'Elimina';
 $labels['shortacll'] = 'Ricerca';
 $labels['shortaclr'] = 'Lettura';
 $labels['shortacls'] = 'Mantieni';
-$labels['shortaclw'] = 'Scrittura';
+$labels['shortaclw'] = 'Scrivi';
 $labels['shortacli'] = 'Inserisci';
 $labels['shortaclp'] = 'Invio';
 $labels['shortaclc'] = 'Crea';

plugins/acl/localization/ku.inc

@@ -28,6 +28,7 @@ $labels['identifier'] = 'Danasîner';
 $labels['acll'] = 'Lê bigere';
 $labels['aclr'] = 'Peyaman bixwîne';
 $labels['aclw'] = 'Alayan binivîse';
+$labels['acli'] = 'Têxe (Heman bike li)';
 $labels['aclp'] = 'Şandî';
 $labels['aclc'] = 'Bindosyeyan çêke';
 $labels['aclk'] = 'Bindosyeyan çêke';
@@ -62,6 +63,11 @@ $labels['shortaclwrite'] = 'Binivîse';
 $labels['shortacldelete'] = 'Jê bibe';
 $labels['longaclr'] = 'Dosye ji bo xwendinê dikare bê vekirin';
 $labels['longacls'] = 'Alaya peyamên Dîtî dikare bête guhartin';
+$labels['longaclc'] = 'Dosye dikarin bin vê dosyeyê bêne çêkirin (an jî binavkirin)';
+$labels['longaclk'] = 'Dosye dikarin bin vê dosyeyê bêne çêkirin (an jî binavkirin)';
+$labels['longaclx'] = 'Dosye dikare bê jêbirin an jî binavkirin';
+$labels['longacla'] = 'Mafê gihîştina dosyeyê dikare bê guhartin';
+$labels['longaclfull'] = 'Tam venêrîn bi birêvebirina dosyeyê';
 $labels['longaclread'] = 'Dosye ji bo xwendinê dikare bê vekirin';
 $labels['longaclwrite'] = 'Peyam dikarin kopiyî dosyeyê bên kirin, nîşankirin, nivîsandin.';
 $labels['longacldelete'] = 'Hêmî peyam dikarin werin jêbirin';

plugins/acl/localization/mn_MN.inc

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = 'Хуваалцах';
+$labels['myrights'] = 'Нэвтрэлтийн зөвшөөрлүүд';
+$labels['username'] = 'Хэрэглэгч:';
+$labels['advanced'] = 'Дэлгэрэнгүй горим';
+$labels['newuser'] = 'Нэмэх';
+$labels['editperms'] = 'Зөвшөөрлүүдийг засах';
+$labels['actions'] = 'Нэвтрэлтийн зөвшөөрлийн үйлдлүүд...';
+$labels['anyone'] = 'Бүх хэрэглэгч (хүн бүр)';
+$labels['anonymous'] = '(Үл таних) зочин';
+$labels['identifier'] = 'Таних мэдээлэл';
+$labels['acll'] = 'Хайх';
+$labels['aclr'] = 'Зурвас унших';
+$labels['acls'] = 'Харсан төлөвт хадгалах';
+$labels['aclw'] = 'Тэмдэглэгээ хийх';
+$labels['acli'] = 'Оруулах (хуулж)';
+$labels['aclp'] = 'Бичлэг';
+$labels['aclc'] = 'Дэд хавтас үүсгэх';
+$labels['aclk'] = 'Дэд хавтас үүсгэх';
+$labels['acld'] = 'Захиануудыг устгах';
+$labels['aclt'] = 'Захиануудыг устгах';
+$labels['acle'] = 'Устгах';
+$labels['aclx'] = 'Хавтас устгах';
+$labels['acla'] = 'Зохицуулагч';
+$labels['acln'] = 'Тайлбар зурвас';
+$labels['aclfull'] = 'Бүрэн удирдлага';
+$labels['aclother'] = 'Бусад';
+$labels['aclread'] = 'Уншсан';
+$labels['aclwrite'] = 'Бичих';
+$labels['acldelete'] = 'Устгах';
+$labels['shortacll'] = 'Хайх';
+$labels['shortaclr'] = 'Унших';
+?>

plugins/acl/localization/ru_RU.inc

@@ -25,18 +25,18 @@ $labels['actions'] = 'Действия с правами доступа...';
 $labels['anyone'] = 'Все пользователи (любые)';
 $labels['anonymous'] = 'Гости (анонимные)';
 $labels['identifier'] = 'Идентификатор';
-$labels['acll'] = 'Поиск';
-$labels['aclr'] = 'Прочитать сообщения';
-$labels['acls'] = 'Оставить состояние Увидено';
-$labels['aclw'] = 'Флаги записи';
-$labels['acli'] = 'Вставить (копировать в...)';
+$labels['acll'] = 'Просмотр';
+$labels['aclr'] = 'Чтение сообщений';
+$labels['acls'] = 'Сохранение состояния Прочитано';
+$labels['aclw'] = 'Запись флагов';
+$labels['acli'] = 'Вставка (копирование в...)';
 $labels['aclp'] = 'Отправить';
-$labels['aclc'] = 'Создать вложенные папки';
-$labels['aclk'] = 'Создать вложенные папки';
-$labels['acld'] = 'Удалить сообщения';
-$labels['aclt'] = 'Удалить сообщения';
-$labels['acle'] = 'Уничтожить сообщения';
-$labels['aclx'] = 'Удалить папку';
+$labels['aclc'] = 'Создание вложенных папок';
+$labels['aclk'] = 'Создание вложенных папок';
+$labels['acld'] = 'Удаление сообщений';
+$labels['aclt'] = 'Удаление сообщений';
+$labels['acle'] = 'Уничтожение сообщений';
+$labels['aclx'] = 'Удаление папки';
 $labels['acla'] = 'Администрировать';
 $labels['acln'] = 'Комментировать сообщения';
 $labels['aclfull'] = 'Полный доступ';
@@ -46,7 +46,7 @@ $labels['aclwrite'] = 'Запись';
 $labels['acldelete'] = 'Удаление';
 $labels['shortacll'] = 'Поиск';
 $labels['shortaclr'] = 'Чтение';
-$labels['shortacls'] = 'Оставить';
+$labels['shortacls'] = 'Прочитано';
 $labels['shortaclw'] = 'Запись';
 $labels['shortacli'] = 'Вставить';
 $labels['shortaclp'] = 'Отправить';
@@ -54,7 +54,7 @@ $labels['shortaclc'] = 'Создать';
 $labels['shortaclk'] = 'Создать';
 $labels['shortacld'] = 'Удаление';
 $labels['shortaclt'] = 'Удаление';
-$labels['shortacle'] = 'Уничтожить сообщения';
+$labels['shortacle'] = 'Уничтожение';
 $labels['shortaclx'] = 'Удаление папки';
 $labels['shortacla'] = 'Администрировать';
 $labels['shortacln'] = 'Комментировать';

plugins/acl/localization/sr_CS.inc

@@ -18,5 +18,35 @@
 $labels['sharing'] = 'Дељење';
 $labels['myrights'] = 'Права приступа';
 $labels['username'] = 'Корисник:';
+$labels['advanced'] = 'Напредни режим';
 $labels['newuser'] = 'Додај унос';
+$labels['editperms'] = 'Уреди дозволе';
+$labels['actions'] = 'Радње права приступа...';
+$labels['anyone'] = 'Сви корисници (било ко)';
+$labels['anonymous'] = 'Гости (анонимно)';
+$labels['identifier'] = 'Идентификатор';
+$labels['acll'] = 'Потражи';
+$labels['aclr'] = 'Прочитане поруке';
+$labels['acls'] = 'Очувај стање прегледаности';
+$labels['acli'] = 'Убаци (копирај у)';
+$labels['aclc'] = 'Направи потфасцикле';
+$labels['aclk'] = 'Направи потфасцикле';
+$labels['acld'] = 'Обриши поруке';
+$labels['aclt'] = 'Обриши поруке';
+$labels['aclx'] = 'Обриши фасциклу';
+$labels['acla'] = 'Администрирај';
+$labels['aclfull'] = 'Пуна контрола';
+$labels['aclother'] = 'Друго';
+$labels['aclread'] = 'Читање';
+$labels['aclwrite'] = 'Упис';
+$labels['acldelete'] = 'Обриши';
+$labels['shortacll'] = 'Потражи';
+$labels['shortaclr'] = 'Прочитана';
+$labels['shortacls'] = 'Задржи';
+$labels['shortaclw'] = 'Пиши';
+$labels['shortacli'] = 'Убаци';
+$labels['shortaclother'] = 'Друго';
+$labels['shortaclread'] = 'Читање';
+$labels['shortaclwrite'] = 'Упис';
+$labels['shortacldelete'] = 'Брисање';
 ?>

plugins/acl/localization/tr_TR.inc

@@ -71,7 +71,7 @@ $labels['longaclp'] = 'Mesajlar bu dizine gönderilebilir';
 $labels['longaclc'] = 'Dizinler doğrudan bu klasör altında oluşturulabilir veya yeniden adlandırılabilir.';
 $labels['longaclk'] = 'Dizinler doğrudan bu klasör altında oluşturulabilir veya yeniden adlandırılabilir.';
 $labels['longacld'] = 'mesajları sil bayrakları değiştirilebilir';
-$labels['longaclt'] = 'mesajları sil bayrakları değiştirilebilir';
+$labels['longaclt'] = 'mesajları sil, bayraklar değiştirilebilir';
 $labels['longacle'] = 'Mesajlar silinebilir';
 $labels['longaclx'] = 'Klasörü silinebilir veya yeniden adlandırılabilir';
 $labels['longacla'] = 'Dizin erişim hakları değiştirilebilir';
@@ -85,10 +85,10 @@ $labels['ariasummaryacltable'] = 'Erişim hakları listesi';
 $labels['arialabelaclactions'] = 'Aksiyon listesi';
 $labels['arialabelaclform'] = 'Erişim hakları formu';
 $messages['deleting'] = 'Erişim hakları siliniyor...';
-$messages['saving'] = 'Erişim hakları saklanıyor...';
-$messages['updatesuccess'] = 'Erişim hakları başarıyla değiştirildi';
-$messages['deletesuccess'] = 'Erişim hakları başarıyla silindi';
-$messages['createsuccess'] = 'Erişim hakları başarıyla eklendi';
+$messages['saving'] = 'Erişim hakları kaydediliyor...';
+$messages['updatesuccess'] = 'Erişim hakları değiştirildi';
+$messages['deletesuccess'] = 'Erişim hakları silindi';
+$messages['createsuccess'] = 'Erişim hakları eklendi';
 $messages['updateerror'] = 'Erişim hakları güncellenemedi';
 $messages['deleteerror'] = 'Erişim haklarını silinemedi';
 $messages['createerror'] = 'Erişim hakları eklenemedi';

plugins/acl/skins/larry/templates/table.html

@@ -19,7 +19,7 @@
     </ul>
 </div>
 
-<div id="aclform" class="propform" style="position:absolute; width:480px; top:0; left:0; padding:8px" aria-labelledby="aria-label-aclform" aria-hidden="true" role="dialog">
+<div id="aclform" class="propform" aria-labelledby="aria-label-aclform" aria-hidden="true" role="dialog">
     <h3 id="aria-label-aclform" class="voice"><roundcube:label name="acl.arialabelaclform" /></h3>
     <fieldset class="thinbordered"><legend><roundcube:label name="acl.identifier" /></legend>
         <roundcube:object name="acluser" id="acluser" size="35" class="proplist" />

plugins/additional_message_headers/additional_message_headers.php

@@ -24,23 +24,33 @@ class additional_message_headers extends rcube_plugin
     {
         $this->load_config();
 
-        $headers = $args['message']->headers();
-        $rcube   = rcube::get_instance();
+        $rcube = rcube::get_instance();
 
         // additional email headers
         $additional_headers = $rcube->config->get('additional_message_headers', array());
-        foreach ((array)$additional_headers as $header => $value) {
-            if (null === $value) {
-                unset($headers[$header]);
+
+        if (!empty($additional_headers)) {
+            // Mail_mime >= 1.9.0
+            if (method_exists($message, 'isMultipart')) {
+                $args['message']->headers($additional_headers, true);
             }
             else {
-                $headers[$header] = $value;
+                $headers = $args['message']->headers();
+
+                foreach ((array) $additional_headers as $header => $value) {
+                    if ($value === null) {
+                        unset($headers[$header]);
+                    }
+                    else {
+                        $headers[$header] = $value;
+                    }
+                }
+
+                $args['message']->_headers = array();
+                $args['message']->headers($headers);
             }
         }
 
-        $args['message']->_headers = array();
-        $args['message']->headers($headers);
-
         return $args;
     }
 }

plugins/additional_message_headers/composer.json

@@ -3,7 +3,7 @@
     "type": "roundcube-plugin",
     "description": "Very simple plugin which will add additional headers to or remove them from outgoing messages.",
     "license": "GPLv2",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "authors": [
         {
             "name": "Ziba Scott",

plugins/archive/archive.php

@@ -122,8 +122,10 @@ class archive extends rcube_plugin
       $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
       $messageset = array($current_mbox => $index->get());
     }
-    else {
-      $messageset = rcmail::get_uids();
+    else if (!empty($uids)) {
+      $messageset = rcmail::get_uids($uids, $current_mbox);
+    } else {
+      $messageset = array();
     }
 
     foreach ($messageset as $mbox => $uids) {

plugins/archive/localization/fr_FR.inc

@@ -15,13 +15,13 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-$labels['buttontext'] = 'Archive';
+$labels['buttontext'] = 'Archiver';
 $labels['buttontitle'] = 'Archiver ce courriel';
 $labels['archived'] = 'Archivé avec succès';
 $labels['archivedreload'] = 'Archivé avec succès. Recharger la page pour voir les nouveaux dossiers d\'archives.';
 $labels['archiveerror'] = 'Certains courriels n\'ont pas pu être archivés.';
-$labels['archivefolder'] = 'Archive';
-$labels['settingstitle'] = 'Archive';
+$labels['archivefolder'] = 'Archiver';
+$labels['settingstitle'] = 'Archiver';
 $labels['archivetype'] = 'Diviser l\'archive par';
 $labels['archivetypeyear'] = 'Année (ex. Archives/2012)';
 $labels['archivetypemonth'] = 'Mois (ex. Archives/2012/06)';

plugins/archive/localization/it_IT.inc

@@ -25,7 +25,7 @@ $labels['settingstitle'] = 'Archivio';
 $labels['archivetype'] = 'Dividi archivio per';
 $labels['archivetypeyear'] = 'Anno (es. Archivio/2012)';
 $labels['archivetypemonth'] = 'Mese (es. Archivio/2012/06)';
-$labels['archivetypefolder'] = 'Cartella originale';
+$labels['archivetypefolder'] = 'Cartella di origine';
 $labels['archivetypesender'] = 'Mittente email';
 $labels['unkownsender'] = 'sconosciuto';
 ?>

plugins/archive/localization/ku.inc

@@ -16,7 +16,16 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 $labels['buttontext'] = 'Arşîv';
-$labels['buttontitle'] = 'am masaja bxa arşiv';
-$labels['archived'] = 'ba gşti Arşiv kra';
+$labels['buttontitle'] = 'vê peyamê arşîv bike';
+$labels['archived'] = 'Bi serkeftin hat arşîvkirin';
+$labels['archivedreload'] = 'Bi serkeftin hat arşîvkirin. Rûpelê dîsa bar bike da dosyeyên arşîvê yên nû bibînî.';
+$labels['archiveerror'] = 'Hin peyam nehatin arşîvkirin.';
 $labels['archivefolder'] = 'Arşîv';
+$labels['settingstitle'] = 'Arşîv';
+$labels['archivetype'] = 'Arşîvê dabeşîne';
+$labels['archivetypeyear'] = 'Sal (wek Arşîv/2012)';
+$labels['archivetypemonth'] = 'Meh (wek Arşîv/2012/06)';
+$labels['archivetypefolder'] = 'Dosyeya resen';
+$labels['archivetypesender'] = 'Emaila şandyar';
+$labels['unkownsender'] = 'nenas';
 ?>

plugins/archive/localization/mn_MN.inc

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/archive/localization/<lang>.inc                                |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
+*/
+$labels['buttontext'] = 'Архив';
+$labels['buttontitle'] = 'Энэ зурвасыг архивлах';
+$labels['archived'] = 'Амжилттай архивлагдлаа';
+$labels['archivedreload'] = 'Амжилттай архивлагдлаа. Хуудсыг дахин дуудаж шинэ үүссэн архив хавтсыг харна уу.';
+$labels['archiveerror'] = 'Зарим зурвас архивлагдаж чадахгүй';
+$labels['archivefolder'] = 'Архив';
+$labels['settingstitle'] = 'Архив';
+$labels['archivetype'] = 'Архивыг дараахаар ялга: ';
+$labels['archivetypeyear'] = 'Он (жиш: Архив/2012)';
+$labels['archivetypemonth'] = 'Сар (жиш: Архив/2012/06)';
+$labels['archivetypefolder'] = 'Жинхэнэ хавтас';
+$labels['archivetypesender'] = 'Илгээгчийн мэйл хаяг';
+$labels['unkownsender'] = 'мэдэгдэхгүй';
+?>

plugins/archive/localization/sr_CS.inc

@@ -15,8 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-$labels['buttontext'] = 'Arhiva';
-$labels['buttontitle'] = 'Arhivirati ovu poruku';
-$labels['archived'] = 'Uspěšno arhivirano';
-$labels['archivefolder'] = 'Arhiva';
+$labels['buttontext'] = 'Архивирај';
+$labels['buttontitle'] = 'Архивирај ову поруку';
+$labels['archived'] = 'Успешно архивирано';
+$labels['archivedreload'] = 'Успешно архивирано. Поново учитајте страну да видите нове архивиране фасцикле.';
+$labels['archiveerror'] = 'Неке поруке се нису могле архивирати';
+$labels['archivefolder'] = 'Архива';
+$labels['settingstitle'] = 'Архивирање';
+$labels['archivetype'] = 'Разврстај архиве по';
+$labels['archivetypeyear'] = 'години (нпр. Архива/2015)';
+$labels['archivetypemonth'] = 'месецу (нпр. Архива/2015/03)';
+$labels['archivetypefolder'] = 'изворној фасцикли';
+$labels['archivetypesender'] = 'адреси пошиљаоца';
+$labels['unkownsender'] = 'непознат';
 ?>

plugins/archive/localization/tr_TR.inc

@@ -17,8 +17,8 @@
 */
 $labels['buttontext'] = 'Arşiv';
 $labels['buttontitle'] = 'Bu postayı arşivle';
-$labels['archived'] = 'Başarıyla arşivlendi';
-$labels['archivedreload'] = 'Başarıyla arşivlendi. Yeni arşiv dosyalarını görmek için sayfayı yenileyin.';
+$labels['archived'] = 'Arşivleme başarılı.';
+$labels['archivedreload'] = 'Arşivleme başarılı. Yeni arşiv dosyalarını görmek için sayfayı yenileyin.';
 $labels['archiveerror'] = 'Bazı mesajlar arşivlenemedi.';
 $labels['archivefolder'] = 'Arşiv';
 $labels['settingstitle'] = 'Arşiv';

plugins/attachment_reminder/localization/de_DE.inc

@@ -16,5 +16,5 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
 $messages['forgotattachment'] = "Haben Sie möglicherweise vergessen eine Datei anzuhängen?";
-$messages['reminderoption'] = "Erinnern an vergessene Anhänge ";
-$messages['keywords'] = "anbei,im anhang,angehängt,angefügt,beigefügt,beliegend";
+$messages['reminderoption'] = "An vergessene Anhänge erinnern";
+$messages['keywords'] = "anbei,im anhang,siehe anhang,angehängt,angefügt,beigefügt,beliegend";

plugins/attachment_reminder/localization/mn_MN.inc

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
+$messages['forgotattachment'] = "Та файл хавсаргахаа мартсан уу?";
+$messages['reminderoption'] = "Мартсан хавсралтуудыг сануулах";
+$messages['keywords'] = "хавсралт,файл,хавсралт,хавсаргагдсан,хавсаргаж байна,хасваргасан,анкет,танилцуулга";

plugins/database_attachments/database_attachments.php

@@ -22,7 +22,7 @@ class database_attachments extends filesystem_attachments
     protected $cache;
 
     // A prefix for the cache key used in the session and in the key field of the cache table
-    protected $prefix = "db_attach";
+    const PREFIX = "ATTACH";
 
     /**
      * Save a newly uploaded attachment
@@ -43,9 +43,9 @@ class database_attachments extends filesystem_attachments
         $status = $cache->write($key, $data);
 
         if ($status) {
-            $args['id'] = $key;
+            $args['id']     = $key;
             $args['status'] = true;
-            unset($args['path']);
+            $args['path']   = null;
         }
 
         return $args;
@@ -67,6 +67,8 @@ class database_attachments extends filesystem_attachments
             if ($args['data'] === false) {
                 return $args;
             }
+
+            $args['path'] = null;
         }
 
         $data   = base64_encode($args['data']);
@@ -113,10 +115,13 @@ class database_attachments extends filesystem_attachments
         $cache = $this->get_cache();
         $data  = $cache->read($args['id']);
 
-        if ($data) {
+        if ($data !== null && $data !== false) {
             $args['data'] = base64_decode($data);
             $args['status'] = true;
         }
+        else {
+            $args['status'] = false;
+        }
 
         return $args;
     }
@@ -153,9 +158,16 @@ class database_attachments extends filesystem_attachments
             $ttl    = 12 * 60 * 60; // default: 12 hours
             $ttl    = $rcmail->config->get('database_attachments_cache_ttl', $ttl);
             $type   = $rcmail->config->get('database_attachments_cache', 'db');
+            $prefix = self::PREFIX;
+
+            // Add session identifier to the prefix to prevent from removing attachments
+            // in other sessions of the same user (#1490542)
+            if ($id = session_id()) {
+                $prefix .= $id;
+            }
 
             // Init SQL cache (disable cache data serialization)
-            $this->cache = $rcmail->get_cache($this->prefix, 'db', $ttl, false);
+            $this->cache = $rcmail->get_cache($prefix, $type, $ttl, false);
         }
 
         return $this->cache;

plugins/emoticons/composer.json

@@ -3,7 +3,7 @@
     "type": "roundcube-plugin",
     "description": "Sample plugin to replace emoticons in plain text message body with real icons.",
     "license": "GPLv3+",
-    "version": "1.3",
+    "version": "1.4",
     "authors": [
         {
             "name": "Thomas Bruederli",

plugins/emoticons/emoticons.php

@@ -36,8 +36,6 @@ class emoticons extends rcube_plugin
 
         // map of emoticon replacements
         $map = array(
-            '/:\)/'             => $this->img_tag('smiley-smile.gif',       ':)'    ),
-            '/:-\)/'            => $this->img_tag('smiley-smile.gif',       ':-)'   ),
             '/(?<!mailto):D/'   => $this->img_tag('smiley-laughing.gif',    ':D'    ),
             '/:-D/'             => $this->img_tag('smiley-laughing.gif',    ':-D'   ),
             '/:\(/'             => $this->img_tag('smiley-frown.gif',       ':('    ),
@@ -54,8 +52,10 @@ class emoticons extends rcube_plugin
             '/(?<!mailto):-@/i' => $this->img_tag('smiley-yell.gif',        ':-@'   ),
             '/O:\)/i'           => $this->img_tag('smiley-innocent.gif',    'O:)'   ),
             '/O:-\)/i'          => $this->img_tag('smiley-innocent.gif',    'O:-)'  ),
-            '/(?<!mailto):$/'   => $this->img_tag('smiley-embarassed.gif',  ':$'    ),
-            '/(?<!mailto):-$/'  => $this->img_tag('smiley-embarassed.gif',  ':-$'   ),
+            '/(?<!O):\)/'       => $this->img_tag('smiley-smile.gif',       ':)'    ),
+            '/(?<!O):-\)/'      => $this->img_tag('smiley-smile.gif',       ':-)'   ),
+            '/(?<!mailto):\$/'  => $this->img_tag('smiley-embarassed.gif',  ':$'    ),
+            '/(?<!mailto):-\$/' => $this->img_tag('smiley-embarassed.gif',  ':-$'   ),
             '/(?<!mailto):\*/i'  => $this->img_tag('smiley-kiss.gif',       ':*'    ),
             '/(?<!mailto):-\*/i' => $this->img_tag('smiley-kiss.gif',       ':-*'   ),
             '/(?<!mailto):S/i'  => $this->img_tag('smiley-undecided.gif',   ':S'    ),

plugins/emoticons/tests/Emoticons.php

@@ -19,5 +19,45 @@ class Emoticons_Plugin extends PHPUnit_Framework_TestCase
         $this->assertInstanceOf('emoticons', $plugin);
         $this->assertInstanceOf('rcube_plugin', $plugin);
     }
-}
 
+    /**
+     * replace() method tests
+     */
+    function test_replace()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new emoticons($rcube->api);
+
+        $map = array(
+            ':D'  => array('smiley-laughing.gif',    ':D'    ),
+            ':-D' => array('smiley-laughing.gif',    ':-D'   ),
+            ':('  => array('smiley-frown.gif',       ':('    ),
+            ':-(' => array('smiley-frown.gif',       ':-('   ),
+            '8)'  => array('smiley-cool.gif',        '8)'    ),
+            '8-)' => array('smiley-cool.gif',        '8-)'   ),
+            ':O'  => array('smiley-surprised.gif',   ':O'    ),
+            ':-O' => array('smiley-surprised.gif',   ':-O'   ),
+            ':P'  => array('smiley-tongue-out.gif',  ':P'    ),
+            ':-P' => array('smiley-tongue-out.gif',  ':-P'   ),
+            ':@'  => array('smiley-yell.gif',        ':@'    ),
+            ':-@' => array('smiley-yell.gif',        ':-@'   ),
+            'O:)' => array('smiley-innocent.gif',    'O:)'   ),
+            'O:-)' => array('smiley-innocent.gif',    'O:-)' ),
+            ':)'  => array('smiley-smile.gif',       ':)'    ),
+            ':-)' => array('smiley-smile.gif',       ':-)'   ),
+            ':$'  => array('smiley-embarassed.gif',  ':$'    ),
+            ':-$' => array('smiley-embarassed.gif',  ':-$'   ),
+            ':*'  => array('smiley-kiss.gif',       ':*'     ),
+            ':-*' => array('smiley-kiss.gif',       ':-*'    ),
+            ':S'  => array('smiley-undecided.gif',   ':S'    ),
+            ':-S' => array('smiley-undecided.gif',   ':-S'   ),
+        );
+
+        foreach ($map as $body => $expected) {
+            $args = array('type' => 'plain', 'body' => $body);
+            $args = $plugin->replace($args);
+            $this->assertRegExp('/' . preg_quote($expected[0], '/') . '/', $args['body']);
+            $this->assertRegExp('/title="' . preg_quote($expected[1], '/') . '"/', $args['body']);
+        }
+    }
+}

plugins/filesystem_attachments/filesystem_attachments.php

@@ -7,12 +7,19 @@
  * attachments of messages currently being composed, writing attachments
  * to disk when drafts with attachments are re-opened and writing
  * attachments to disk for inline display in current html compositions.
+ * It also handles uploaded files for other uses, so not only attachments.
  *
  * Developers may wish to extend this class when creating attachment
  * handler plugins:
  *   require_once('plugins/filesystem_attachments/filesystem_attachments.php');
  *   class myCustom_attachments extends filesystem_attachments
  *
+ * Note for developers: It is plugin's responsibility to care about security.
+ * So, e.g. if the plugin is asked about some file path it should check
+ * if it's really the storage path of the plugin and not e.g. /etc/passwd.
+ * It is done by setting 'status' flag on every plugin hook it uses.
+ * Roundcube core will trust the returned path if status=true.
+ *
  * @license GNU GPLv3+
  * @author Ziba Scott <ziba@umich.edu>
  * @author Thomas Bruederli <roundcube@gmail.com>
@@ -107,7 +114,7 @@ class filesystem_attachments extends rcube_plugin
      */
     function remove($args)
     {
-        $args['status'] = @unlink($args['path']);
+        $args['status'] = $this->verify_path($args['path']) && @unlink($args['path']);
         return $args;
     }
 
@@ -118,7 +125,7 @@ class filesystem_attachments extends rcube_plugin
      */
     function display($args)
     {
-        $args['status'] = file_exists($args['path']);
+        $args['status'] = $this->verify_path($args['path']) && file_exists($args['path']);
         return $args;
     }
 
@@ -129,6 +136,10 @@ class filesystem_attachments extends rcube_plugin
      */
     function get($args)
     {
+        if (!$this->verify_path($args['path'])) {
+            $args['path'] = null;
+        }
+
         return $args;
     }
 
@@ -147,7 +158,7 @@ class filesystem_attachments extends rcube_plugin
                 }
 
                 foreach ((array)$files as $filename) {
-                    if(file_exists($filename)) {
+                    if (file_exists($filename)) {
                         unlink($filename);
                     }
                 }
@@ -182,4 +193,34 @@ class filesystem_attachments extends rcube_plugin
             }
         }
     }
+
+    /**
+     * For security we'll always verify the file path stored in session,
+     * as session entries can be faked in various ways e.g. #6026.
+     * We allow only files in Roundcube temp dir
+     */
+    protected function verify_path($path)
+    {
+        if (empty($path)) {
+            return false;
+        }
+
+        $rcmail    = rcube::get_instance();
+        $temp_dir  = $rcmail->config->get('temp_dir');
+        $file_path = pathinfo($path, PATHINFO_DIRNAME);
+
+        if ($temp_dir !== $file_path) {
+            rcube::raise_error(array(
+                    'code'    => 403,
+                    'file'    => __FILE__,
+                    'line'    => __LINE__,
+                    'message' => sprintf("%s can't read %s (not in temp_dir)",
+                        $rcmail->get_user_name(), substr($path, 0, 512))
+                ), true, false);
+
+            return false;
+        }
+
+        return true;
+    }
 }

plugins/help/config.inc.php.dist

@@ -33,3 +33,5 @@ $config['help_license_url'] = null;
 // Determine whether to open the help in a new window
 $config['help_open_extwin'] = false;
 
+// URL to additional information about CSRF protection
+$config['help_csrf_info'] = null;

plugins/help/help.php

@@ -34,6 +34,7 @@ class help extends rcube_plugin
         $this->register_action('license', array($this, 'action'));
 
         $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('error_page', array($this, 'error_page'));
     }
 
     function startup($args)
@@ -82,8 +83,14 @@ class help extends rcube_plugin
     function tablink($attrib)
     {
         $rcmail = rcmail::get_instance();
+
         $attrib['name'] = 'helplink' . $attrib['action'];
         $attrib['href'] = $rcmail->url(array('_action' => $attrib['action'], '_extwin' => !empty($_REQUEST['_extwin']) ? 1 : null));
+
+        // title might be already translated here, so revert to it's initial value
+        // so button() will translate it correctly
+        $attrib['title'] = $attrib['label'];
+
         return $rcmail->output->button($attrib);
     }
 
@@ -134,6 +141,16 @@ class help extends rcube_plugin
         return $rcmail->output->frame($attrib);
     }
 
+    function error_page($args)
+    {
+        $rcmail = rcmail::get_instance();
+
+        if ($args['code'] == 403 && $rcmail->request_status == rcube::REQUEST_ERROR_URL && ($url = $rcmail->config->get('help_csrf_info'))) {
+            $args['text'] .= '<p>' . html::a(array('href' => $url, 'target' => '_blank'), $this->gettext('csrfinfo')) . '</p>';
+        }
+
+        return $args;
+    }
 
     private function resolve_language($path)
     {

plugins/help/localization/bg_BG.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Помощ';
 $labels['about'] = 'Относно';
 $labels['license'] = 'Лиценз';
+$labels['csrfinfo'] = 'Прочети повече за CSRF и как си защитен';
 ?>

plugins/help/localization/cy_GB.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Cymorth';
 $labels['about'] = 'Amdan';
 $labels['license'] = 'Trwydded';
+$labels['csrfinfo'] = 'Darllenwch fwy am CSRF a sut rydyn ni\'n amddiffyn chi.';
 ?>

plugins/help/localization/de_CH.inc

@@ -16,6 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 $labels['help'] = 'Hilfe';
-$labels['about'] = 'Information';
+$labels['about'] = 'Über';
 $labels['license'] = 'Lizenz';
+$labels['csrfinfo'] = 'Erfahren Sie mehr über CSRF und wie wir Sie davor schützen';
 ?>

plugins/help/localization/de_DE.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Hilfe';
 $labels['about'] = 'Über';
 $labels['license'] = 'Lizenz';
+$labels['csrfinfo'] = 'Erfahren Sie mehr über CSRF und wie wir Sie schützen';
 ?>

plugins/help/localization/en_US.inc

@@ -20,5 +20,6 @@ $labels = array();
 $labels['help'] = 'Help';
 $labels['about'] = 'About';
 $labels['license'] = 'License';
+$labels['csrfinfo'] = 'Read more about CSRF and how we protect you';
 
 ?>

plugins/help/localization/es_ES.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Ayuda';
 $labels['about'] = 'Acerca de';
 $labels['license'] = 'Licencia';
+$labels['csrfinfo'] = 'Lea más sobre CSRF y cómo le protegemos';
 ?>

plugins/help/localization/fi_FI.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Ohje';
 $labels['about'] = 'Tietoja';
 $labels['license'] = 'Lisenssi';
+$labels['csrfinfo'] = 'Lue lisää CSRF:stä ja kuinka suojaamme sinua';
 ?>

plugins/help/localization/fr_FR.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Help';
 $labels['about'] = 'About';
 $labels['license'] = 'License';
+$labels['csrfinfo'] = 'Apprenez-en davantage sur les attaques CSRF et comment nous vous protégeons';
 ?>

plugins/help/localization/he_IL.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'עזרה';
 $labels['about'] = 'אודות';
 $labels['license'] = 'רשיון';
+$labels['csrfinfo'] = 'נא לקרוא כעת אודות CSRF וכיצד אנו מגינים עליך.';
 ?>

plugins/help/localization/hu_HU.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Súgó';
 $labels['about'] = 'Névjegy';
 $labels['license'] = 'Licensz';
+$labels['csrfinfo'] = 'Olvass többet a CSRF-ről és arról hogy védünk meg ettöl';
 ?>

plugins/help/localization/it_IT.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Aiuto';
 $labels['about'] = 'Informazioni';
 $labels['license'] = 'Licenza';
+$labels['csrfinfo'] = 'Maggiori informazioni su CSRF e su come ti proteggiamo';
 ?>

plugins/help/localization/ja_JP.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'ヘルプ';
 $labels['about'] = 'このプログラムについて';
 $labels['license'] = 'ライセンス';
+$labels['csrfinfo'] = 'CSRFと安全を保つ方法についてさらに読む';
 ?>

plugins/help/localization/lt_LT.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Žinynas';
 $labels['about'] = 'Apie';
 $labels['license'] = 'Licencija';
+$labels['csrfinfo'] = 'Išsamiau apie CSRF ir apie tai, kaip jie jus apsaugo.';
 ?>

plugins/help/localization/mn_MN.inc

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+$labels['help'] = 'Тусламж';
+$labels['about'] = 'Танилцуулга';
+$labels['license'] = 'Лиценз';
+$labels['csrfinfo'] = 'Бид таныг яаж хамгаалж байгаа буюу CSRF-ын тухай дэлгэрэнгүй унших';
+?>

plugins/help/localization/nl_NL.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Help';
 $labels['about'] = 'Over';
 $labels['license'] = 'Licentie';
+$labels['csrfinfo'] = 'Lees meer over CSRF en hoe we u beschermen';
 ?>

plugins/help/localization/pt_BR.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Ajuda';
 $labels['about'] = 'Sobre';
 $labels['license'] = 'Licença';
+$labels['csrfinfo'] = 'Leia mais sobre CSRF e como nós protegemos você';
 ?>

plugins/help/localization/pt_PT.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Ajuda';
 $labels['about'] = 'Sobre...';
 $labels['license'] = 'Licença';
+$labels['csrfinfo'] = 'Leia mais sobre CSRF e como nós o protegemos';
 ?>

plugins/help/localization/ru_RU.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Помощь';
 $labels['about'] = 'О программе';
 $labels['license'] = 'Лицензия';
+$labels['csrfinfo'] = 'Узнайте больше о CSRF и о том как мы защищаем вас';
 ?>

plugins/help/localization/sk_SK.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Pomocník';
 $labels['about'] = 'O aplikácii';
 $labels['license'] = 'Licencia';
+$labels['csrfinfo'] = 'Prečítajte si viac o útokoch typu CSRF a o tom, ako vás môžeme pred nimi ochrániť';
 ?>

plugins/help/localization/sr_CS.inc

@@ -16,6 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 $labels['help'] = 'Помоћ';
-$labels['about'] = 'Info';
-$labels['license'] = 'Licenca';
+$labels['about'] = 'О програму';
+$labels['license'] = 'Лиценца';
+$labels['csrfinfo'] = 'Прочитајте о ЦСРФ-у и како вас штитимо';
 ?>

plugins/help/localization/sv_SE.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Hjälp';
 $labels['about'] = 'Om';
 $labels['license'] = 'Licens';
+$labels['csrfinfo'] = 'Läs mer om CSRF och skyddet mot detta';
 ?>

plugins/help/localization/tr_TR.inc

@@ -18,4 +18,5 @@
 $labels['help'] = 'Yardım';
 $labels['about'] = 'Hakkında';
 $labels['license'] = 'Lisans';
+$labels['csrfinfo'] = 'Sizi koruma ve CSRF hakkında daha fazla bilgi.';
 ?>

plugins/hide_blockquote/localization/mn_MN.inc

@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+*/
+$labels['hide'] = 'Нуух';
+$labels['show'] = 'Харах';
+$labels['quotelimit'] = 'Хэрвээ мөрийн тоо дараахаас их бол ишлэлийг харуулахгүй:';
+?>

plugins/managesieve/Changelog

@@ -1,3 +1,16 @@
+* version 8.4 [2015-04-20]
+-----------------------------------------------------------
+- Add option to prepopulate vacation addresses on form init (#1490030)
+- Add option to define default vacation interval
+- Fix missing position idicator in Larry skin when dragging a filter
+- Fix incorrect filter data after filter delete (#1490356)
+
+* version 8.3 [2015-03-12]
+-----------------------------------------------------------
+- Fix PHP fatal error when visiting Vacation interface and there's no sieve script yet
+- Fix handling of header test with one-element array as header name
+- Fix missing host:port in connection error message
+
 * version 8.2 [2015-01-14]
 -----------------------------------------------------------
 - Fix bug where actions without if/elseif/else in sieve scripts were skipped

plugins/managesieve/composer.json

@@ -3,7 +3,7 @@
     "type": "roundcube-plugin",
     "description": "Adds a possibility to manage Sieve scripts (incoming mail filters). It's clickable interface which operates on text scripts and communicates with server using managesieve protocol. Adds Filters tab in Settings.",
     "license": "GPLv3+",
-    "version": "8.2",
+    "version": "8.3",
     "authors": [
         {
             "name": "Aleksander Machniak",

plugins/managesieve/config.inc.php.dist

@@ -86,5 +86,15 @@ $config['managesieve_domains'] = array();
 // 2 - add Vacation section, but hide Filters section
 $config['managesieve_vacation'] = 0;
 
+// Default vacation interval (in days).
+// Note: If server supports vacation-seconds extension it is possible
+// to define interval in seconds here (as a string), e.g. "3600s".
+$config['managesieve_vacation_interval'] = 0;
+
+// Some servers require vacation :addresses to be filled with all
+// user addresses (aliases). This option enables automatic filling
+// of these on initial vacation form creation.
+$config['managesieve_vacation_addresses_init'] = false;
+
 // Supported methods of notify extension. Default: 'mailto'
 $config['managesieve_notify_methods'] = array('mailto');

plugins/managesieve/helpdocs/en_US/settings-filters.rst

@@ -0,0 +1,55 @@
+.. index:: Filters
+.. _settings-managesieve-filters:
+
+*******
+Filters
+*******
+
+Incoming mail is automatically processed by the server and handled/organized
+according to defined criteria. For example you can tell the server to move the message to
+specified folder, redirect it to another account, send a reply, discard, delete, etc.
+
+Filtering is based on `Sieve <https://www.rfc-editor.org/info/rfc5228>`_ language, which means that under the hood
+all filters are stored as a Sieve script on the server. This interface allows you to
+define rules in easy way without the need to know the language.
+
+Each filter definition has a name and set of rules and actions. Usually 
+the number of definitions is unlimited and they can be grouped into sets
+(scripts) for convenience.
+
+
+Filter sets
+-----------
+
+Filter definitions can be grouped into sets. These can be activated or disactivated.
+Depending on server configuration there can be none, one or more active sets
+at the same time. They need to have a unique name.
+
+New sets can be created as empty or as a copy of an existing set. It is also possible
+to import them from a text file containing Sieve script. Sets in form of a script
+can be also downloaded e.g. for backup or migration purposes.
+
+
+Filter definition
+-----------------
+
+Every filter can be active or inactive, which is convenient if you want to
+disable some actions temporarily.
+
+Because filters are executed in specified order (from top to bottom as you see them on the list)
+you can use drag-and-drop technique to rearange filters on the list.
+
+Every filter definition contains at least one rule and one action. Depending on server
+capabilities a rule can be based e.g. on message headers, body, date or size.
+
+A set of actions also depends on server capabilities. Most servers support:
+
+* moving/copying messages to specified folder
+* redirecting/copying messages to another account
+* discarding messages with specified error message
+* replying (vacation)
+* deleting (ignoring) messages
+* setting flags (e.g. marking as Read)
+
+Note: Some actions stop filtering process, some do not. Use *Stop evaluating rules*
+and *Keep message in Inbox* actions to have more control on this.

plugins/managesieve/helpdocs/en_US/settings-vacation.rst

@@ -0,0 +1,58 @@
+.. index:: Vacation
+.. _settings-managesieve-vacation:
+
+********
+Vacation
+********
+
+The vacation autoresponder's purpose is to provide correspondents with
+notification that the user is away for an extended period of time and that
+they should not expect quick responses.
+
+**Vacation** is used to respond to an incoming message with another message.
+
+This interface is part of :ref:`settings-managesieve-filters` functionality
+and provides a simple way to manage vacation responses.
+
+
+Vacation message
+----------------
+
+To enable the autoresponder you have to set at least the response body and change
+the status to *On*.
+
+**Subject**
+  Response subject is optional. By default the reply subject will be set
+  to *Auto: <original subject>*
+
+**Body**
+  Response body. Here you put the reason of your absence or any other text
+  that will be send to sender.
+
+**Vacation start/end**
+  These fields define when the vacation rule is active and are optional.
+
+**Status**
+  This field activates the rule. If you always use the same response body it is
+  convenient to disable the vacation rule when it's not needed and enable again
+  another time.
+
+Advanced settings
+-----------------
+
+**Reply sender address**
+  This is an email address that will be used as sender of the vacation reply.
+
+**My email addresses**
+  Normally the vacation response is send if recipient address of the incoming
+  message is one of your addresses known to the server. Here you can add
+  more addresses.
+
+**Reply interval**
+  This parameter defines how often the reply to the same sender is generated.
+  When you receive a lot of messages from the same sender in short time,
+  usually you don't want to reply to all of them. By default reply is send once a day.
+
+**Incoming message action**
+  This field defines an action taken on the incoming message. You can discard or keep
+  it or redirect/copy to another account (so it can be handled by another person).

plugins/managesieve/helpdocs/po/settings-filters.pot

@@ -0,0 +1,113 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Roundcube Webmail Help 1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-07 16:59\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:9
+# cdb4a7c71e5343edb8015510da83a0b8
+msgid "Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:11
+# 94cde05fc3f049e8911dffacfb9af0e5
+msgid "Incoming mail is automatically processed by the server and handled/organized according to defined criteria. For example you can tell the server to move the message to specified folder, redirect it to another account, send a reply, discard, delete, etc."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:15
+# c33e9a7b05f24fe59464ff2f1c9e10a5
+msgid "Filtering is based on `Sieve <https://www.rfc-editor.org/info/rfc5228>`_ language, which means that under the hood all filters are stored as a Sieve script on the server. This interface allows you to define rules in easy way without the need to know the language."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:19
+# 95eb7e571ec44698a474407092b6b79c
+msgid "Each filter definition has a name and set of rules and actions. Usually the number of definitions is unlimited and they can be grouped into sets (scripts) for convenience."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:25
+# aa2da905741247b9971687cd4fdb6a21
+msgid "Filter sets"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:27
+# dc9dbc4144034676a720caaf4379e4e3
+msgid "Filter definitions can be grouped into sets. These can be activated or disactivated. Depending on server configuration there can be none, one or more active sets at the same time. They need to have a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:31
+# 03f58cdba04c4282b867c792572a55e6
+msgid "New sets can be created as empty or as a copy of an existing set. It is also possible to import them from a text file containing Sieve script. Sets in form of a script can be also downloaded e.g. for backup or migration purposes."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:37
+# 9144e63ba44b476dadfcc84e33e72b86
+msgid "Filter definition"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:39
+# 602e3696b4bd4db5960351b5af0e72fd
+msgid "Every filter can be active or inactive, which is convenient if you want to disable some actions temporarily."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:42
+# 0f01b114450f4439b210f3831d66c534
+msgid "Because filters are executed in specified order (from top to bottom as you see them on the list) you can use drag-and-drop technique to rearange filters on the list."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:45
+# 0a30f2aa835e430c9f9de2e446f4c311
+msgid "Every filter definition contains at least one rule and one action. Depending on server capabilities a rule can be based e.g. on message headers, body, date or size."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:48
+# d3b9c2df232c4cd891ec6ba4751e02cf
+msgid "A set of actions also depends on server capabilities. Most servers support:"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:50
+# 1ee77f36a88746e0809e903838314e5a
+msgid "moving/copying messages to specified folder"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:51
+# c2669d203d104753830a170af2ceffde
+msgid "redirecting/copying messages to another account"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:52
+# b04abf50eb1948518caff0c9f6d32ad4
+msgid "discarding messages with specified error message"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:53
+# 439873796de6457985088a206b449c5b
+msgid "replying (vacation)"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:54
+# 5b7bce17840647bdba48ffa944b30ec5
+msgid "deleting (ignoring) messages"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:55
+# a12f2f2bebe74c668b637be66352ddb7
+msgid "setting flags (e.g. marking as Read)"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-filters.rst:57
+# a19231cf44e64eeca67da4cd31b0303a
+msgid "Note: Some actions stop filtering process, some do not. Use *Stop evaluating rules* and *Keep message in Inbox* actions to have more control on this."
+msgstr ""
+

plugins/managesieve/helpdocs/po/settings-vacation.pot

@@ -0,0 +1,93 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Roundcube Webmail Help 1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-07 16:59\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:9
+# 6f1988e3ca10490f8b46fdf11ce3553a
+msgid "Vacation"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:11
+# 628c07bf4b424a039800ef834f891841
+msgid "The vacation autoresponder's purpose is to provide correspondents with notification that the user is away for an extended period of time and that they should not expect quick responses."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:15
+# 57607d8b841b42859d3bb4e6abc4d653
+msgid "**Vacation** is used to respond to an incoming message with another message."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:17
+# 34f46a208d324588906b0d3d10a6176c
+msgid "This interface is part of :ref:`settings-managesieve-filters` functionality and provides a simple way to manage vacation responses."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:22
+# 895cd4752ec649bc87850eb4bd149853
+msgid "Vacation message"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:24
+# 5de6ddf9931a481e9d1c9953183b28d8
+msgid "To enable the autoresponder you have to set at least the response body and change the status to *On*."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:28
+# c4790be6b0454aa190190c1e77087414
+msgid "Response subject is optional. By default the reply subject will be set to *Auto: <original subject>*"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:32
+# 65eb9d5c2f8d4a8cb3077c824ecf597f
+msgid "Response body. Here you put the reason of your absence or any other text that will be send to sender."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:36
+# 2b05975ad2ee40e9b64356eb39308a92
+msgid "These fields define when the vacation rule is active and are optional."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:39
+# 575bd1430cdf4ea4bbcfb9d8556393bc
+msgid "This field activates the rule. If you always use the same response body it is convenient to disable the vacation rule when it's not needed and enable again another time."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:44
+# 22d533b9cffd47d39c04cbca07d9513d
+msgid "Advanced settings"
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:47
+# d56d3eac661f41799e4538be4d2806cd
+msgid "This is an email address that will be used as sender of the vacation reply."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:50
+# f2c3d5d2e05c4147bdca65d3b12acdf4
+msgid "Normally the vacation response is send if recipient address of the incoming message is one of your addresses known to the server. Here you can add more addresses."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:55
+# 9b1ee71a799d43ebb8cef4a2555a7b83
+msgid "This parameter defines how often the reply to the same sender is generated. When you receive a lot of messages from the same sender in short time, usually you don't want to reply to all of them. By default reply is send once a day."
+msgstr ""
+
+#: ../../en_US/_plugins/managesieve/settings-vacation.rst:60
+# 8ce4de76e26543f1be25dedb372ce296
+msgid "This field defines an action taken on the incoming message. You can discard or keep it or redirect/copy to another account (so it can be handled by another person)."
+msgstr ""
+

plugins/managesieve/lib/Roundcube/rcube_sieve.php

@@ -68,7 +68,9 @@ class rcube_sieve
             $this->sieve->setDebug(true, array($this, 'debug_handler'));
         }
 
-        if (PEAR::isError($this->sieve->connect($host, $port, $options, $usetls))) {
+        $result = $this->sieve->connect($host, $port, $options, $usetls);
+
+        if (is_a($result, 'PEAR_Error')) {
             return $this->_set_error(self::ERROR_CONNECTION);
         }
 
@@ -78,9 +80,9 @@ class rcube_sieve
             $password = $auth_pw;
         }
 
-        if (PEAR::isError($this->sieve->login($username, $password,
-            $auth_type ? strtoupper($auth_type) : null, $authz))
-        ) {
+        $result = $this->sieve->login($username, $password, $auth_type ? strtoupper($auth_type) : null, $authz);
+
+        if (is_a($result, 'PEAR_Error')) {
             return $this->_set_error(self::ERROR_LOGIN);
         }
 
@@ -115,22 +117,28 @@ class rcube_sieve
      */
     public function save($name = null)
     {
-        if (!$this->sieve)
+        if (!$this->sieve) {
             return $this->_set_error(self::ERROR_INTERNAL);
+        }
 
-        if (!$this->script)
+        if (!$this->script) {
             return $this->_set_error(self::ERROR_INTERNAL);
+        }
 
-        if (!$name)
+        if (!$name) {
             $name = $this->current;
+        }
 
         $script = $this->script->as_text();
 
-        if (!$script)
+        if (!$script) {
             $script = '/* empty script */';
+        }
 
-        if (PEAR::isError($this->sieve->installScript($name, $script)))
+        $result = $this->sieve->installScript($name, $script);
+        if (is_a($result, 'PEAR_Error')) {
             return $this->_set_error(self::ERROR_INSTALL);
+        }
 
         return true;
     }
@@ -140,14 +148,19 @@ class rcube_sieve
      */
     public function save_script($name, $content = null)
     {
-        if (!$this->sieve)
+        if (!$this->sieve) {
             return $this->_set_error(self::ERROR_INTERNAL);
+        }
 
-        if (!$content)
+        if (!$content) {
             $content = '/* empty script */';
+        }
+
+        $result = $this->sieve->installScript($name, $content);
 
-        if (PEAR::isError($this->sieve->installScript($name, $content)))
+        if (is_a($result, 'PEAR_Error')) {
             return $this->_set_error(self::ERROR_INSTALL);
+        }
 
         return true;
     }
@@ -157,14 +170,19 @@ class rcube_sieve
      */
     public function activate($name = null)
     {
-        if (!$this->sieve)
+        if (!$this->sieve) {
             return $this->_set_error(self::ERROR_INTERNAL);
+        }
 
-        if (!$name)
+        if (!$name) {
             $name = $this->current;
+        }
 
-        if (PEAR::isError($this->sieve->setActive($name)))
+        $result = $this->sieve->setActive($name);
+
+        if (is_a($result, 'PEAR_Error')) {
             return $this->_set_error(self::ERROR_ACTIVATE);
+        }
 
         return true;
     }
@@ -174,11 +192,15 @@ class rcube_sieve
      */
     public function deactivate()
     {
-        if (!$this->sieve)
+        if (!$this->sieve) {
             return $this->_set_error(self::ERROR_INTERNAL);
+        }
+
+        $result = $this->sieve->setActive('');
 
-        if (PEAR::isError($this->sieve->setActive('')))
+        if (is_a($result, 'PEAR_Error')) {
             return $this->_set_error(self::ERROR_DEACTIVATE);
+        }
 
         return true;
     }
@@ -188,22 +210,32 @@ class rcube_sieve
      */
     public function remove($name = null)
     {
-        if (!$this->sieve)
+        if (!$this->sieve) {
             return $this->_set_error(self::ERROR_INTERNAL);
+        }
 
-        if (!$name)
+        if (!$name) {
             $name = $this->current;
+        }
 
         // script must be deactivated first
-        if ($name == $this->sieve->getActive())
-            if (PEAR::isError($this->sieve->setActive('')))
+        if ($name == $this->sieve->getActive()) {
+            $result = $this->sieve->setActive('');
+
+            if (is_a($result, 'PEAR_Error')) {
                 return $this->_set_error(self::ERROR_DELETE);
+            }
+        }
+
+        $result = $this->sieve->removeScript($name);
 
-        if (PEAR::isError($this->sieve->removeScript($name)))
+        if (is_a($result, 'PEAR_Error')) {
             return $this->_set_error(self::ERROR_DELETE);
+        }
 
-        if ($name == $this->current)
+        if ($name == $this->current) {
             $this->current = null;
+        }
 
         return true;
     }
@@ -221,7 +253,7 @@ class rcube_sieve
 
         $ext = $this->sieve->getExtensions();
 
-        if (PEAR::isError($ext)) {
+        if (is_a($ext, 'PEAR_Error')) {
             return array();
         }
 
@@ -250,8 +282,9 @@ class rcube_sieve
 
             $list = $this->sieve->listScripts();
 
-            if (PEAR::isError($list))
+            if (is_a($list, 'PEAR_Error')) {
                 return $this->_set_error(self::ERROR_OTHER);
+            }
 
             $this->list = $list;
         }
@@ -283,8 +316,9 @@ class rcube_sieve
 
         $script = $this->sieve->getScript($name);
 
-        if (PEAR::isError($script))
+        if (is_a($script, 'PEAR_Error')) {
             return $this->_set_error(self::ERROR_OTHER);
+        }
 
         // try to parse from Roundcube format
         $this->script = $this->_parse($script);
@@ -349,8 +383,9 @@ class rcube_sieve
 
         $content = $this->sieve->getScript($name);
 
-        if (PEAR::isError($content))
+        if (is_a($content, 'PEAR_Error')) {
             return $this->_set_error(self::ERROR_OTHER);
+        }
 
         return $content;
     }
@@ -366,10 +401,12 @@ class rcube_sieve
         if ($copy) {
             $content = $this->sieve->getScript($copy);
 
-            if (PEAR::isError($content))
+            if (is_a($content, 'PEAR_Error')) {
                 return $this->_set_error(self::ERROR_OTHER);
+            }
         }
 
+
         return $this->save_script($name, $content);
     }
 

plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

@@ -63,7 +63,7 @@ class rcube_sieve_engine
         1 => 'notifyimportancehigh'
     );
 
-    const VERSION  = '8.2';
+    const VERSION  = '8.4';
     const PROGNAME = 'Roundcube (Managesieve)';
     const PORT     = 4190;
 
@@ -122,9 +122,6 @@ class rcube_sieve_engine
                 case rcube_sieve::ERROR_CONNECTION:
                 case rcube_sieve::ERROR_LOGIN:
                     $this->rc->output->show_message('managesieve.filterconnerror', 'error');
-                    rcube::raise_error(array('code' => 403, 'type' => 'php',
-                        'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Unable to connect to managesieve on $host:$port"), true, false);
                     break;
 
                 default:
@@ -210,7 +207,18 @@ class rcube_sieve_engine
             $plugin['socket_options']
         );
 
-        return $this->sieve->error();
+        $error = $this->sieve->error();
+
+        if ($error) {
+            rcube::raise_error(array(
+                    'code'    => 403,
+                    'file'    => __FILE__,
+                    'line'    => __LINE__,
+                    'message' => "Unable to connect to managesieve on $host:$port"
+                ), true, false);
+        }
+
+        return $error;
     }
 
     /**
@@ -389,11 +397,14 @@ class rcube_sieve_engine
                 }
             }
             else if ($action == 'setget') {
+                $this->rc->request_security_check(rcube_utils::INPUT_GET);
+
                 $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
-                $script = $this->sieve->get_script($script_name);
+                $script      = $this->sieve->get_script($script_name);
 
-                if (PEAR::isError($script))
+                if (is_a($script, 'PEAR_Error')) {
                     exit;
+                }
 
                 $browser = new rcube_browser;
 
@@ -432,6 +443,11 @@ class rcube_sieve_engine
 
                 $this->rc->output->command('managesieve_actionfill', $content, $id, $aid);
             }
+            else if ($action == 'addresses') {
+                $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_POST);
+
+                $this->rc->output->command('managesieve_vacation_addresses_update', $aid, $this->user_emails());
+            }
 
             $this->rc->output->send();
         }
@@ -1393,19 +1409,21 @@ class rcube_sieve_engine
         }
 
         if (isset($rule['test'])) {
-            if (in_array($rule['test'], array('header', 'address', 'envelope'))
-                && !is_array($rule['arg1'])
-                && ($header = strtolower($rule['arg1']))
-                && isset($this->headers[$header])
-            ) {
-                $test = $header;
+            if (in_array($rule['test'], array('header', 'address', 'envelope'))) {
+                if (is_array($rule['arg1']) && count($rule['arg1']) == 1) {
+                    $rule['arg1'] = $rule['arg1'][0];
+                }
+
+                $matches = ($header = strtolower($rule['arg1'])) && isset($this->headers[$header]);
+                $test    = $matches ? $header : '...';
             }
-            else if ($rule['test'] == 'exists'
-                && !is_array($rule['arg'])
-                && ($header = strtolower($rule['arg']))
-                && isset($this->headers[$header])
-            ) {
-                $test = $header;
+            else if ($rule['test'] == 'exists') {
+                if (is_array($rule['arg']) && count($rule['arg']) == 1) {
+                    $rule['arg'] = $rule['arg'][0];
+                }
+
+                $matches = ($header = strtolower($rule['arg'])) && isset($this->headers[$header]);
+                $test    = $matches ? $header : '...';
             }
             else if (in_array($rule['test'], array('size', 'body', 'date', 'currentdate'))) {
                 $test = $rule['test'];
@@ -1758,7 +1776,10 @@ class rcube_sieve_engine
             . "</textarea>\n";
 
         // vacation
-        $vsec = in_array('vacation-seconds', $this->exts);
+        $vsec      = in_array('vacation-seconds', $this->exts);
+        $auto_addr = $this->rc->config->get('managesieve_vacation_addresses_init');
+        $addresses = isset($action['addresses']) || !$auto_addr ? (array) $action['addresses'] : $this->user_emails();
+
         $out .= '<div id="action_vacation' .$id.'" style="display:' .($action['type']=='vacation' ? 'inline' : 'none') .'">';
         $out .= '<span class="label">'. rcube::Q($this->plugin->gettext('vacationreason')) .'</span><br />'
             .'<textarea name="_action_reason['.$id.']" id="action_reason' .$id. '" '
@@ -1769,11 +1790,13 @@ class rcube_sieve_engine
             .'value="' . (is_array($action['subject']) ? rcube::Q(implode(', ', $action['subject']), 'strict', false) : $action['subject']) . '" size="35" '
             . $this->error_class($id, 'action', 'subject', 'action_subject') .' />';
         $out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('vacationaddr')) . '</span><br />'
-            . $this->list_input($id, 'action_addresses', $action['addresses'], true,
-                $this->error_class($id, 'action', 'addresses', 'action_addresses'), 30);
+            . $this->list_input($id, 'action_addresses', $addresses, true,
+                $this->error_class($id, 'action', 'addresses', 'action_addresses'), 30)
+            . html::a(array('href' => '#', 'onclick' => rcmail_output::JS_OBJECT_NAME . ".managesieve_vacation_addresses($id)"),
+                rcube::Q($this->plugin->gettext('filladdresses')));
         $out .= '<br /><span class="label">' . rcube::Q($this->plugin->gettext($vsec ? 'vacationinterval' : 'vacationdays')) . '</span><br />'
             .'<input type="text" name="_action_interval['.$id.']" id="action_interval'.$id.'" '
-            .'value="' .rcube::Q(isset($action['seconds']) ? $action['seconds'] : $action['days'], 'strict', false) . '" size="2" '
+            .'value="' .rcube::Q(rcube_sieve_vacation::vacation_interval($action), 'strict', false) . '" size="2" '
             . $this->error_class($id, 'action', 'interval', 'action_interval') .' />';
         if ($vsec) {
             $out .= '&nbsp;<label><input type="radio" name="_action_interval_type['.$id.']" value="days"'
@@ -2344,12 +2367,12 @@ class rcube_sieve_engine
      */
     protected function init_script()
     {
-        $this->script = $this->sieve->script->as_array();
-
-        if (!$this->script) {
+        if (!$this->sieve->script) {
             return;
         }
 
+        $this->script = $this->sieve->script->as_array();
+
         $headers    = array();
         $exceptions = array('date', 'currentdate', 'size', 'body');
 
@@ -2378,4 +2401,21 @@ class rcube_sieve_engine
 
         $this->headers += $headers;
     }
+
+    /**
+     * Get all e-mail addresses of the user
+     */
+    protected function user_emails()
+    {
+        $addresses = $this->rc->user->list_emails();
+
+        foreach ($addresses as $idx => $email) {
+            $addresses[$idx] = $email['email'];
+        }
+
+        $addresses = array_unique($addresses);
+        sort($addresses);
+
+        return $addresses;
+    }
 }

plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php

@@ -329,14 +329,23 @@ class rcube_sieve_vacation extends rcube_sieve_engine
             'noclose' => true
             ) + $attrib);
 
+        $auto_addr = $this->rc->config->get('managesieve_vacation_addresses_init');
+        $addresses = !$auto_addr || count($this->vacation) > 1 ? (array) $this->vacation['addresses'] : $this->user_emails();
+
         // form elements
         $subject   = new html_inputfield(array('name' => 'vacation_subject', 'id' => 'vacation_subject', 'size' => 50));
         $reason    = new html_textarea(array('name' => 'vacation_reason', 'id' => 'vacation_reason', 'cols' => 60, 'rows' => 8));
         $interval  = new html_inputfield(array('name' => 'vacation_interval', 'id' => 'vacation_interval', 'size' => 5));
         $addresses = '<textarea name="vacation_addresses" id="vacation_addresses" data-type="list" data-size="30" style="display: none">'
-            . rcube::Q(implode("\n", (array) $this->vacation['addresses']), 'strict', false) . '</textarea>';
+            . rcube::Q(implode("\n", $addresses), 'strict', false) . '</textarea>';
         $status    = new html_select(array('name' => 'vacation_status', 'id' => 'vacation_status'));
         $action    = new html_select(array('name' => 'vacation_action', 'id' => 'vacation_action', 'onchange' => 'vacation_action_select()'));
+        $addresses_link = new html_inputfield(array(
+                'type'    => 'button',
+                'href'    => '#',
+                'class' => 'button',
+                'onclick' => rcmail_output::JS_OBJECT_NAME . '.managesieve_vacation_addresses()'
+            ));
 
         $status->add($this->plugin->gettext('vacation.on'), 'on');
         $status->add($this->plugin->gettext('vacation.off'), 'off');
@@ -357,7 +366,7 @@ class rcube_sieve_vacation extends rcube_sieve_engine
             }
         }
 
-        $interval_txt = $interval->show(isset($this->vacation['seconds']) ? $this->vacation['seconds'] : $this->vacation['days']);
+        $interval_txt = $interval->show(self::vacation_interval($this->vacation));
         if ($seconds_extension) {
             $interval_select = new html_select(array('name' => 'vacation_interval_type'));
             $interval_select->add($this->plugin->gettext('days'), 'days');
@@ -461,7 +470,7 @@ class rcube_sieve_vacation extends rcube_sieve_engine
         $table = new html_table(array('cols' => 2));
 
         $table->add('title', html::label('vacation_addresses', $this->plugin->gettext('vacation.addresses')));
-        $table->add(null, $addresses);
+        $table->add(null, $addresses . $addresses_link->show($this->plugin->gettext('filladdresses')));
         $table->add('title', html::label('vacation_interval', $this->plugin->gettext('vacation.interval')));
         $table->add(null, $interval_txt);
 
@@ -550,6 +559,36 @@ class rcube_sieve_vacation extends rcube_sieve_engine
         return $result;
     }
 
+    /**
+     * Get current vacation interval
+     */
+    public static function vacation_interval(&$vacation)
+    {
+        $rcube = rcube::get_instance();
+
+        if (isset($vacation['seconds'])) {
+            $interval = $vacation['seconds'];
+        }
+        else if (isset($vacation['days'])) {
+            $interval = $vacation['days'];
+        }
+        else if ($interval_cfg = $rcube->config->get('managesieve_vacation_interval')) {
+            if (preg_match('/^([0-9]+)s$/', $interval_cfg, $m)) {
+                if ($seconds_extension) {
+                    $vacation['seconds'] = ($interval = intval($m[1])) ? $interval : null;
+                }
+                else {
+                    $vacation['days'] = $interval = ceil(intval($m[1])/86400);
+                }
+            }
+            else {
+                $vacation['days'] = $interval = intval($interval_cfg);
+            }
+        }
+
+        return $interval ? $interval : '';
+    }
+
     /**
      * Saves vacation script (adding some variables)
      */
@@ -562,62 +601,74 @@ class rcube_sieve_vacation extends rcube_sieve_engine
                 $this->script_name = 'roundcube';
             }
 
-            $this->script = array($rule);
-            $script_active = false;
+            // use default script contents
+            if (!$this->rc->config->get('managesieve_kolab_master')) {
+                $script_file = $this->rc->config->get('managesieve_default');
+                if ($script_file && is_readable($script_file)) {
+                    $content = file_get_contents($script_file);
+                }
+            }
+
+            // create and load script
+            if ($this->sieve->save_script($this->script_name, $content)) {
+                $this->sieve->load($this->script_name);
+            }
         }
-        // if script exists
-        else {
-            $script_active = in_array($this->script_name, $this->active);
 
-            // re-order rules if needed
-            if (isset($rule['after']) && $rule['after'] !== '') {
-                // reset original vacation rule
-                if (isset($this->vacation['idx'])) {
-                    $this->script[$this->vacation['idx']] = null;
-                }
+        $script_active = in_array($this->script_name, $this->active);
 
-                // add at target position
-                if ($rule['after'] >= count($this->script) - 1) {
-                    $this->script[] = $rule;
-                }
-                else {
-                    $script = array();
+        // re-order rules if needed
+        if (isset($rule['after']) && $rule['after'] !== '') {
+            // reset original vacation rule
+            if (isset($this->vacation['idx'])) {
+                $this->script[$this->vacation['idx']] = null;
+            }
 
-                    foreach ($this->script as $idx => $r) {
-                        if ($r) {
-                            $script[] = $r;
-                        }
+            // add at target position
+            if ($rule['after'] >= count($this->script) - 1) {
+                $this->script[] = $rule;
+            }
+            else {
+                $script = array();
 
-                        if ($idx == $rule['after']) {
-                            $script[] = $rule;
-                        }
+                foreach ($this->script as $idx => $r) {
+                    if ($r) {
+                        $script[] = $r;
                     }
 
-                    $this->script = $script;
+                    if ($idx == $rule['after']) {
+                        $script[] = $rule;
+                    }
                 }
 
-                $this->script = array_values(array_filter($this->script));
-            }
-            // update original vacation rule if it exists
-            else if (isset($this->vacation['idx'])) {
-                $this->script[$this->vacation['idx']] = $rule;
-            }
-            // otherwise put vacation rule on top
-            else {
-                array_unshift($this->script, $rule);
+                $this->script = $script;
             }
 
-            // if the script was not active, we need to de-activate
-            // all rules except the vacation rule, but only if it is not disabled
-            if (!$script_active && !$rule['disabled']) {
-                foreach ($this->script as $idx => $r) {
-                    if (empty($r['actions']) || $r['actions'][0]['type'] != 'vacation') {
-                        $this->script[$idx]['disabled'] = true;
-                    }
+            $this->script = array_values(array_filter($this->script));
+        }
+        // update original vacation rule if it exists
+        else if (isset($this->vacation['idx'])) {
+            $this->script[$this->vacation['idx']] = $rule;
+        }
+        // otherwise put vacation rule on top
+        else {
+            array_unshift($this->script, $rule);
+        }
+
+        // if the script was not active, we need to de-activate
+        // all rules except the vacation rule, but only if it is not disabled
+        if (!$script_active && !$rule['disabled']) {
+            foreach ($this->script as $idx => $r) {
+                if (empty($r['actions']) || $r['actions'][0]['type'] != 'vacation') {
+                    $this->script[$idx]['disabled'] = true;
                 }
             }
         }
 
+        if (!$this->sieve->script) {
+            return false;
+        }
+
         $this->sieve->script->content = $this->script;
 
         // save the script

plugins/managesieve/localization/ar_SA.inc

@@ -54,7 +54,6 @@ $labels['add'] = 'إضافة';
 $labels['del'] = 'حذف';
 $labels['sender'] = 'المرسل';
 $labels['recipient'] = 'مستلم';
-$labels['vacationaddr'] = 'عناوين البريد الالكتروني(ـة) الاضافية:';
 $labels['vacationdays'] = 'في الغالب كم رسالة ترسل (بالايام):';
 $labels['vacationinterval'] = 'كم عدد الرسائل المرسلة عادةً:';
 $labels['vacationreason'] = 'نص الرسالة (بسبب الاجازة):';
@@ -150,7 +149,6 @@ $labels['vacation.body'] = 'محتوى ';
 $labels['vacation.status'] = 'الحالة ';
 $labels['vacation.on'] = 'تشغيل';
 $labels['vacation.off'] = 'ايقاف';
-$labels['vacation.addresses'] = 'عناوينني الاضافية';
 $labels['vacation.saving'] = 'يتم حفظ البيانات...';
 $messages['filterunknownerror'] = 'خطا غير معروف من الخادم.';
 $messages['filterconnerror'] = 'لا يمكن الاتصال بالخادم.';

plugins/managesieve/localization/az_AZ.inc

@@ -54,7 +54,6 @@ $labels['add'] = 'Əlavə et';
 $labels['del'] = 'Sil';
 $labels['sender'] = 'Göndərən';
 $labels['recipient'] = 'Qəbul edən';
-$labels['vacationaddr'] = 'Mənim əlavə e-poçt ünvan(lar)ım: ';
 $labels['vacationdays'] = 'Məktub neçə müddətdən bir göndərilsin (gündə):';
 $labels['vacationinterval'] = 'Məktublar nə qədər sıx göndərilsin:';
 $labels['vacationreason'] = 'Məktubun mətni (səbəb yoxdur):';

plugins/managesieve/localization/be_BE.inc

@@ -54,7 +54,6 @@ $labels['add'] = 'Дадаць';
 $labels['del'] = 'Выдаліць';
 $labels['sender'] = 'Ад каго';
 $labels['recipient'] = 'Каму';
-$labels['vacationaddr'] = 'Дадатковы(я) адрасы эл. пошты:';
 $labels['vacationdays'] = 'Як часта дасылаць паведамленні (у днях):';
 $labels['vacationinterval'] = 'Як часта дасылаць паведамленні:';
 $labels['vacationreason'] = 'Цела паведамлення (прычына вакацый):';

plugins/managesieve/localization/bg_BG.inc

@@ -54,10 +54,10 @@ $labels['add'] = 'Добави';
 $labels['del'] = 'Изтрий';
 $labels['sender'] = 'Подател';
 $labels['recipient'] = 'Получател';
-$labels['vacationaddr'] = 'Мои допълнителни e-mail адреси:';
+$labels['vacationaddr'] = 'Мои допълнителни адреси:';
 $labels['vacationdays'] = 'Колко често да праща писма (в дни):';
 $labels['vacationinterval'] = 'Колко често да праща писма:';
-$labels['vacationreason'] = 'Текст на писмото (причина за ваканцията)';
+$labels['vacationreason'] = 'Текст на писмото (причина за отпуск)';
 $labels['vacationsubject'] = 'Заглавие на писмото';
 $labels['days'] = 'дни';
 $labels['seconds'] = 'секунди';
@@ -165,13 +165,28 @@ $labels['vacation.reply'] = 'Писмо отговор';
 $labels['vacation.advanced'] = 'Разширени настройки';
 $labels['vacation.subject'] = 'Относно';
 $labels['vacation.body'] = 'Съдържание';
+$labels['vacation.start'] = 'Начало на отпуск';
+$labels['vacation.end'] = 'Край на отпуск';
 $labels['vacation.status'] = 'Статус';
 $labels['vacation.on'] = 'Вкл.';
 $labels['vacation.off'] = 'Изкл.';
-$labels['vacation.addresses'] = 'Моите допълнителни адреси';
+$labels['vacation.addresses'] = 'Мои допълнителни адреси';
 $labels['vacation.interval'] = 'Интервал на отговор';
 $labels['vacation.after'] = 'Постави правило за отпуск след';
 $labels['vacation.saving'] = 'Запис на данни...';
+$labels['vacation.action'] = 'Действие при получаване на писмо';
+$labels['vacation.keep'] = 'Задръж';
+$labels['vacation.discard'] = 'Изхвърли';
+$labels['vacation.redirect'] = 'Препрати на';
+$labels['vacation.copy'] = 'Прати копие на';
+$labels['filladdresses'] = 'Попълни с всички мои адреси';
+$labels['arialabelfiltersetactions'] = 'Действия на набор от филтри';
+$labels['arialabelfilteractions'] = 'Действия на филтър';
+$labels['arialabelfilterform'] = 'Свойства на филтър';
+$labels['ariasummaryfilterslist'] = 'Списък филтри';
+$labels['ariasummaryfiltersetslist'] = 'Списък набори от филтри';
+$labels['filterstitle'] = 'Редакция на филтри вх. поща';
+$labels['vacationtitle'] = 'Редакция на правило за извън офиса';
 $messages['filterunknownerror'] = 'Неизвестна сървърна грешка.';
 $messages['filterconnerror'] = 'Неуспешно свързване с managesieve сървъра.';
 $messages['filterdeleteerror'] = 'Невъзможно изтриване на филтъра. Възникна сървърна грешка.';
@@ -206,4 +221,5 @@ $messages['nodata'] = 'Поне една позиция трябва да е и
 $messages['invaliddateformat'] = 'невалидна дата или формат на част от дата';
 $messages['saveerror'] = 'Невъзможен запис на данни. Грешка при достъп до сървър.';
 $messages['vacationsaved'] = 'Данните за отпуск са записани успешно.';
+$messages['emptyvacationbody'] = 'Липсва текст на писмо при отпуск!';
 ?>

plugins/managesieve/localization/bs_BA.inc

@@ -54,7 +54,6 @@ $labels['add'] = 'Dodaj';
 $labels['del'] = 'Obriši';
 $labels['sender'] = 'Pošiljaoc';
 $labels['recipient'] = 'Primaoc';
-$labels['vacationaddr'] = 'Moje dodatne email adrese:';
 $labels['vacationdays'] = 'Frekvencija slanja poruka (u danima):';
 $labels['vacationinterval'] = 'Frekvencija slanja poruka:';
 $labels['vacationreason'] = 'Tijelo poruke (razlog za odmor):';
@@ -170,7 +169,6 @@ $labels['vacation.end'] = 'Kraj odmora';
 $labels['vacation.status'] = 'Status';
 $labels['vacation.on'] = 'Uključeno';
 $labels['vacation.off'] = 'Isključeno';
-$labels['vacation.addresses'] = 'Moje dodatne adrese';
 $labels['vacation.interval'] = 'Interval odgovora';
 $labels['vacation.after'] = 'Pravilo za odmor stavi nakon';
 $labels['vacation.saving'] = 'Snimam podatke...';

plugins/managesieve/localization/ca_ES.inc

@@ -54,7 +54,6 @@ $labels['add'] = 'Afegeix';
 $labels['del'] = 'Suprimeix';
 $labels['sender'] = 'Remitent';
 $labels['recipient'] = 'Destinatari';
-$labels['vacationaddr'] = 'Les meves adreces de correu addicionals:';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
 $labels['vacationinterval'] = 'Amb quina freqüència s\'han d\'enviar els missatges:';
 $labels['vacationreason'] = 'Cos del missatge (raó de l\'absència):';
@@ -170,7 +169,6 @@ $labels['vacation.end'] = 'Finalització de vacances';
 $labels['vacation.status'] = 'Estat';
 $labels['vacation.on'] = 'Activat';
 $labels['vacation.off'] = 'Desactivat';
-$labels['vacation.addresses'] = 'Les meves adreces addicionals:';
 $labels['vacation.interval'] = 'Interval de resposta';
 $labels['vacation.after'] = 'Posa la regla de vacances després';
 $labels['vacation.saving'] = 'S\'estan desant les dades...';