Kolab Groupware OBS

roundcubemail.spec Changed

@@ -49,14 +49,14 @@
 %global tmpdir /var/lib/roundcubemail
 
 %global rc_version 1.4
-%global rc_rel_suffix rc1.167
+%global rc_rel_suffix rc1.221
 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
 
 Name:           roundcubemail
 Version:        1.4
 
-Release:        242%{?dot_rel_suffix}%{?dist}
+Release:        248%{?dot_rel_suffix}%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -3434,7 +3434,10 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Mon Jun  2 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-246.rc1.167
+* Mon Jul  1 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-248.rc1.221
+- Check in 221 revisions ahead of the upstream 1.4-rc1 release
+
+* Mon Jun  3 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-246.rc1.167
 - Check in 167 revisions ahead of the upstream 1.4-rc1 release
 
 * Mon May 20 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.4-242.rc1.133

debian.changelog Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/dumpschema.sh Deleted

@@ -1,96 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 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.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Dumps database schema in XML format using MDB2_Schema               |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
-
-require INSTALL_PATH.'program/include/clisetup.php';
-
-/** callback function for schema dump **/
-function print_schema($dump)
-{
-	foreach ((array)$dump as $part)
-		echo $dump . "\n";
-}
-
-$config = new rcube_config();
-
-// don't allow public access if not in devel_mode
-if (!$config->get('devel_mode') && $_SERVER'REMOTE_ADDR') {
-	header("HTTP/1.0 401 Access denied");
-	die("Access denied!");
-}
-
-$options = array(
-	'use_transactions' => false,
-	'log_line_break' => "\n",
-	'idxname_format' => '%s',
-	'debug' => false,
-	'quote_identifier' => true,
-	'force_defaults' => false,
-	'portability' => false,
-);
-
-$dsnw = $config->get('db_dsnw');
-$dsn_array = MDB2::parseDSN($dsnw);
-
-// set options for postgres databases
-if ($dsn_array'phptype' == 'pgsql') {
-	$options'disable_smart_seqname' = true;
-	$options'seqname_format' = '%s';
-}
-
-$schema =& MDB2_Schema::factory($dsnw, $options);
-$schema->db->supported'transactions' = false;
-
-
-// send as text/xml when opened in browser
-if ($_SERVER'REMOTE_ADDR')
-	header('Content-Type: text/xml');
-
-
-if (PEAR::isError($schema)) {
-	$error = $schema->getMessage() . ' ' . $schema->getUserInfo();
-}
-else {
-	$dump_config = array(
-		// 'output_mode' => 'file',
-		'output' => 'print_schema',
-	);
-	
-	$definition = $schema->getDefinitionFromDatabase();
-	$definition'charset' = 'utf8';
-
-	if (PEAR::isError($definition)) {
-		$error = $definition->getMessage() . ' ' . $definition->getUserInfo();
-	}
-	else {
-		$operation = $schema->dumpDatabase($definition, $dump_config, MDB2_SCHEMA_DUMP_STRUCTURE);
-		if (PEAR::isError($operation)) {
-			$error = $operation->getMessage() . ' ' . $operation->getUserInfo();
-		}
-	}
-}
-
-$schema->disconnect();
-
-if ($error && !$_SERVER'REMOTE_ADDR') {
-	fwrite(STDERR, $error);
-}
-
-?>

roundcubemail-1.4-rc1.167.tar.gz/bin/exportgettext.sh Deleted

@@ -1,235 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 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.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Export PHP-based localization files to PO files for gettext         |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
-require INSTALL_PATH.'program/include/clisetup.php';
-
-if ($argc < 2) {
-	die("Usage: " . basename($argv0) . " SRCDIR DESTDIR\n");
-}
-
-$srcdir = unslashify(realpath($argv1));
-$destdir = unslashify($argv2);
-$layout = 'launchpad';  # or 'narro';
-$langcode_map = array(
-	'hy_AM' => 'hy',
-	'ar_SA' => 'ar',
-	'az_AZ' => 'az',
-	'bg_BG' => 'bg',
-	'bs_BA' => 'bs',
-	'ca_ES' => 'ca',
-	'cs_CZ' => 'cs',
-	'cy_GB' => 'cy',
-	'da_DK' => 'da',
-	'et_EE' => 'et',
-	'el_GR' => 'el',
-	'eu_ES' => 'eu',
-	'fa_IR' => 'fa',
-	'ga_IE' => 'ga',
-	'ka_GE' => 'ka',
-	'gl_ES' => 'gl',
-	'he_IL' => 'he',
-	'hi_IN' => 'hi',
-	'hr_HR' => 'hr',
-	'ja_JP' => 'ja',
-	'ko_KR' => 'ko',
-	'km_KH' => 'km',
-	'ms_MY' => 'ms',
-	'mr_IN' => 'mr',
-	'ml_IN' => 'ml',
-	'pl_PL' => 'pl',
-	'si_LK' => 'si',
-	'sl_SI' => 'sl',
-	'sq_AL' => 'sq',
-	'sr_CS' => 'sr',
-	'sv_SE' => 'sv',
-	'uk_UA' => 'uk',
-	'vi_VN' => 'vi',
-);
-
-
-// converting roundcube localization dir
-if (is_dir($srcdir.'/en_US')) {
-	load_en_US($srcdir.'/en_US');
-	
-	foreach (glob($srcdir.'/*') as $locdir) {
-		if (is_dir($locdir)) {
-			$lang = basename($locdir);
-			//echo "$locdir => $destdir$lang\n";
-			convert_dir($locdir, $destdir . ($layout != 'launchpad' ? $lang : ''));
-		}
-	}
-}
-// converting single localization directory
-else if (is_dir($srcdir)) {
-	if (is_file($srcdir.'/en_US.inc'))  // plugin localization
-		load_en_US($srcdir.'/en_US.inc');
-	else
-		load_en_US(realpath($srcdir.'/../en_US'));  // single language
-	convert_dir($srcdir, $destdir);
-}
-// converting a single file
-else if (is_file($srcdir)) {
-	//load_en_US();
-	convert_file($srcdir, $destdir);
-}
-
-
-/**
- * Load en_US localization which is used to build msgids
- */
-function load_en_US($fn)
-{
-	$texts = array();
-	
-	if (is_dir($fn)) {
-		foreach (glob($fn.'/*.inc') as $ifn) {
-			include($ifn);
-			$texts = array_merge($texts, (array)$labels, (array)$messages);
-		}
-	}
-	else if (is_file($fn)) {
-		include($fn);
-		$texts = array_merge($texts, (array)$labels, (array)$messages);
-	}
-	
-	$GLOBALS'en_US' = $texts;
-}
-
-/**
- * Convert all .inc files in the given src directory
- */
-function convert_dir($indir, $outdir)
-{
-	global $layout;
-	
-	if (!is_dir($outdir))  // attempt to create destination dir
-		mkdir($outdir, 0777, true);
-
-	foreach (glob($indir.'/*.inc') as $fn) {
-		$filename = basename($fn);
-
-		// create subdir for each template (launchpad rules)
-		if ($layout == 'launchpad' && preg_match('/^(labels|messages)/', $filename, $m)) {
-			$lang = end(explode('/', $indir));
-			$destdir = $outdir . '/' . $m1;
-			if (!is_dir($destdir))
-				mkdir($destdir, 0777, true);
-			$outfn = $destdir . '/' . $lang . '.po';
-		}
-		else {
-			$outfn = $outdir . '/' . preg_replace('/\.a-z0-9+$/i', '', basename($fn)) . '.po';
-		}
-
-		convert_file($fn, $outfn);
-	}
-}
-
-/**
- * Convert the given Roundcube localization file into a gettext .po file
- */
-function convert_file($fn, $outfn)
-{
-	global $layout, $langcode_map;
-
-	$basename =  basename($fn);
-	$srcname = str_replace(INSTALL_PATH, '', $fn);
-	$product = preg_match('!plugins/(\w+)!', $srcname, $m) ? 'roundcube-plugin-' . $m1 : 'roundcubemail';
-	$lang = preg_match('!/(a-z{2}(_A-Z{2})?)./!', $outfn, $m) ? $m1 : '';
-	$labels = $messages = $seen = array();
-
-	if (is_dir($outfn))
-		$outfn .= '/' . $basename . '.po';
-
-	// launchpad requires the template file to have the same name as the directory
-	if (strstr($outfn, '/en_US') && $layout == 'launchpad') {
-		$a = explode('/', $outfn);
-		array_pop($a);
-		$templ = end($a);
-		$a = $templ . '.pot';
-		$outfn = join('/', $a);
-		$is_pot = true;
-	}
-	// launchpad is very picky about file names
-	else if ($layout == 'launchpad' && preg_match($regex = '!/(a-z{2})_(A-Z{2})!', $outfn, $m)) {
-		if ($shortlang = $langcode_map$lang)
-			$outfn = preg_replace($regex, '/'.$shortlang, $outfn);
-		else if ($m1 == strtolower($m2))
-			$outfn = preg_replace($regex, '/\1', $outfn);
-	}
-
-	include($fn);
-	$texts = array_merge($labels, $messages);
-	
-	// write header
-	$header = <<<EOF
-# Converted from Roundcube PHP localization files
-# Copyright (C) 2011 The Roundcube Dev Team
-# This file is distributed under the same license as the Roundcube package.
-#
-#: %s
-msgid ""
-msgstr ""
-"Project-Id-Version: %s\\n"
-"Report-Msgid-Bugs-To: \\n"
-"%s: %s\\n"
-"Last-Translator: \\n"
-"Language-Team: Translations <hello@roundcube.net>\\n"
-"Language: %s\\n"
-"Content-Type: text/plain; charset=UTF-8\\n"
-"Content-Transfer-Encoding: 8bit\\n"
-EOF;
-	
-	$out = sprintf($header, $srcname, $product, $is_pot ? "POT-Creation-Date" : "PO-Revision-Date", date('c'), $shortlang ? $shortlang : $lang);

roundcubemail-1.4-rc1.167.tar.gz/bin/importgettext.sh Deleted

@@ -1,198 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 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.                     |
- |                                                                       |
- | PURPOSE:                                                              |
- |   Import localizations from gettext PO format                         |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
-require INSTALL_PATH.'program/include/clisetup.php';
-
-if ($argc < 2) {
-	die("Usage: " . basename($argv0) . " SRCDIR\n");
-}
-
-$srcdir = unslashify(realpath($argv1));
-
-if (is_dir($srcdir)) {
-	$out = import_dir($srcdir);
-}
-else if (is_file($srcdir)) {
-	$out = import_file($srcdir);
-}
-
-// write output files
-foreach ($out as $outfn => $texts) {
-	$lang = preg_match('!/(a-z{2}(_A-Z{2})?)./!', $outfn, $m) ? $m1 : '';
-	$varname = strpos($outfn, 'messages.inc') !== false ? 'messages' : 'labels';
-
-	$header = <<<EOF
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/%s/%-51s|
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) %s, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: %-62s|
- +-----------------------------------------------------------------------+
-*/
-
-$%s = array();
-
-EOF;
-
-	$author = preg_replace('/\s*<Unknown>/i', '', $texts'_translator');
-	$output = sprintf($header, $lang, $varname.'.inc', date('Y'), $author, $varname);
-
-	foreach ($texts as $label => $value) {
-		if (is_array($value)) { var_dump($outfn, $label, $value); exit; }
-		if ($label0 != '_' && strlen($value))
-			$output .= sprintf("\$%s'%s' = '%s';\n", $varname, $label, strtr(addcslashes($value, "'"), array("\r" => '', "\n" => '\n')));
-	}
-
-	$output .= "\n";
-	$dir = dirname($outfn);
-	@mkdir($dir, 0755, true);
-	if (file_put_contents($outfn, $output))
-		echo "-> $outfn\n";
-}
-
-
-/**
- * Convert all .po files in the given src directory
- */
-function import_dir($indir)
-{
-	$out = array();
-	foreach (glob($indir.'/*.po') as $fn) {
-		$out = array_merge_recursive($out, import_file($fn));
-	}
-	return $out;
-}
-
-/**
- * Convert the given .po file into a Roundcube localization array
- */
-function import_file($fn)
-{
-	$out = array();
-	$lines = file($fn);
-	$language = '';
-	$translator = '';
-
-	// get language code from file name
-	if (preg_match('/-(a-z_+).po$/i', $fn, $m))
-	  $language = expand_langcode($m1);
-
-	$is_header = true;
-	$msgid = null;
-	$msgstr = '';
-	$dests = array();
-	foreach ($lines as $i => $line) {
-		$line = trim($line);
-
-		// parse header
-		if ($is_header && $line0 == '"') {
-			list($key, $val) = explode(": ", preg_replace('/\\\n$/', '', trim($line, '"')), 2);
-			switch (strtolower($key)) {
-				case 'language':
-					$language = expand_langcode($val);
-					break;
-				case 'last-translator':
-					$translator = $val;
-					break;
-			}
-		}
-
-		// empty line
-		if ($line == '') {
-			if ($msgid && $dests) {
-				foreach ($dests as $dest) {
-					list($file, $label) = explode(':', $dest);
-					$out$file$label = $msgstr;
-					$out$file'_translator' = $translator;
-				}
-			}
-
-			$msgid = null;
-			$msgstr = '';
-			$dests = array();
-		}
-
-		// meta line
-		if ($line0 == '#') {
-			$value = trim(substr($line, 2));
-			if ($line1 == ':')
-				$dests = str_replace('en_US', $language, $value);
-		}
-		else if (strpos($line, 'msgid') === 0) {
-			$msgid = gettext_decode(substr($line, 6));
-
-			if (!empty($msgid))
-				$is_header = false;
-		}
-		else if (strpos($line, 'msgstr') === 0) {
-			$msgstr = gettext_decode(substr($line, 7));
-		}
-		else if ($msgid && $line0 == '"') {
-			$msgstr .= gettext_decode($line);
-		}
-		else if ($msgid !== null && $line0 == '"') {
-			$msgid .= gettext_decode($line);
-		}
-	}
-
-	if ($msgid && $dests) {
-		foreach ($dests as $dest) {
-			list($file, $label) = explode(':', $dest);
-			$out$file$label = $msgstr;
-			$out$file'_translator' = $translator;
-		}
-	}
-
-	return $language ? $out : array();
-}
-
-
-function gettext_decode($str)
-{
-	return stripslashes(trim($str, '"'));
-}
-
-/**
- * Translate two-chars language codes to our internally used language identifiers
- */
-function expand_langcode($lang)
-{
-	static $rcube_language_aliases, $rcube_languages;
-
-	if (!$rcube_language_aliases)
-		include(INSTALL_PATH . 'program/localization/index.inc');
-
-	if ($rcube_language_aliases$lang)
-		return $rcube_language_aliases$lang;
-	else if (strlen($lang) == 2 && !isset($rcube_languages$lang))
-		return strtolower($lang) . '_' . strtoupper($lang);
-	else
-		return $lang;
-}
-
-
-?>

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700.woff Deleted

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700.woff2 Deleted

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700italic.woff Deleted

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700italic.woff2 Deleted

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-italic.woff Deleted

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-italic.woff2 Deleted

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-regular.woff Deleted

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-regular.woff2 Deleted

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/images/contactgroup.png Deleted

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/images/contactpic.png Deleted

roundcubemail-1.4-rc1.167.tar.gz/.travis.yml -> roundcubemail-1.4-rc1.221.tar.gz/.travis.yml Changed

roundcubemail-1.4-rc1.167.tar.gz/CHANGELOG -> roundcubemail-1.4-rc1.221.tar.gz/CHANGELOG Changed

@@ -8,8 +8,16 @@
 - Don't log full session identifiers in userlogins log (#6625)
 - Support $HasAttachment/$HasNoAttachment keywords (#6201)
 - Support PECL memcached extension as a session and cache storage driver (experimental)
+- Switch to IDNA2008 variant (#6806)
 - installto.sh: Add possibility to run the update even on the up-to-date installation (#6533)
+- Plugin API: Add 'render_folder_selector' hook
+- Added 'keyservers' option to define list of HKP servers for Enigma/Mailvelope (#6326)
+- Changes in `display_next` setting (#6795):
+    - Move it to Preferences > User Interface > Main Options
+    - Make it apply to Contacts interface too
+    - Make it apply only if deleting/moving a previewed message/contact
 - Redis: Support connection to unix socket
+- Put charset meta specification before a title tag, add page title automatically (#6811)
 - Elastic: Add Prev/Next buttons on message page toolbar (#6648)
 - Elastic: Close search options on Enter key press in quick-search input (#6660)
 - Elastic: Changed read/unread icons (#6636)
@@ -23,14 +31,21 @@
 - Elastic: Fix bug where some menu actions could cause a browser popup warning
 - Elastic: Fix handling mailto: URL parameters in contact menu (#6751)
 - Elastic: Fix keyboard navigation in some menus, e.g. the contact menu
+- Elastic: Fix visual issue with long buttons in .boxwarning (#6797)
+- Elastic: Fix handling new-line in text pasted to a recipient input
+- Elastic: Add default icon on Settings/Preferences lists for external plugins (#6814)
 - Larry: Fix regression where menu actions didn't work with keyboard (#6740)
+- ACL: Display user/group names (from ldap) instead of acl identifier
 - Password: Added ldap_exop driver (#4992)
+- Password: Added support for SSHA512 password algorithm (#6805)
 - Managesieve: Fix bug where global includes were requested for vacation (#6716)
 - Managesieve: Use RFC-compliant line endings, CRLF instead of LF (#6686)
 - Managesieve: Fix so "Create filter" option does not show up when Filters menu is disabled (#6723)
+- Enigma: For verified signatures, display the user id associated with the sender address (#5958)
 - Enigma: Fix bug where revoked users/keys were not greyed out in key info
 - Enigma: Fix error message when trying to encrypt with a revoked key (#6607)
 - Enigma: Fix "decryption oracle" bug CVE-2019-10740 (#6638)
+- Fix css styles leak from replied/forwarded message to the rest of the composed text (#6831)
 - Fix invalid path to "add contact" icon when using assets_path setting
 - Fix invalid path to blocked.gif when using assets_path setting (#6752)
 - Fix so advanced search dialog is not automatically displayed on searchonly addressbooks (#6679)
@@ -48,6 +63,9 @@
 - Fix bug in parsing vCard data using PHP 7.3 due to an invalid regexp (#6744)
 - Fix bug where bold/strong text was converted to upper-case on html-to-text conversion (6758)
 - Fix bug in rcube_utils::parse_hosts() where %t, %d, %z could return only tld (#6746)
+- Fix bug where Next/Prev button in mail view didn't work with multi-folder search result (#6793)
+- Fix bug where selection of columns on messages list wasn't working
+- Fix bug in converting multi-page Tiff images to Jpeg (#6824)
 
 RELEASE 1.4-rc1
 ---------------

roundcubemail-1.4-rc1.167.tar.gz/INSTALL -> roundcubemail-1.4-rc1.221.tar.gz/INSTALL Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/cleandb.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/cleandb.sh Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/cssshrink.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/cssshrink.sh Changed

@@ -5,42 +5,42 @@
 COMPILER_URL="https://github.com/yui/yuicompressor/releases/download/v${VERSION}/yuicompressor-${VERSION}.zip"
 
 do_shrink() {
-	rm -f "$2"
-	java -jar $JAR_DIR/yuicompressor.jar -v -o "$2" "$1"
+    rm -f "$2"
+    java -jar $JAR_DIR/yuicompressor.jar -v -o "$2" "$1"
 }
 
 if  ! -w "$JAR_DIR" ; then
-	JAR_DIR=$PWD
+    JAR_DIR=$PWD
 fi
 
 if java -version >/dev/null 2>&1; then
-	:
+    :
 else
-	echo "Java not found. Please ensure that the 'java' program is in your PATH."
-	exit 1
+    echo "Java not found. Please ensure that the 'java' program is in your PATH."
+    exit 1
 fi
 
 if  ! -r "$JAR_DIR/yuicompressor.jar" ; then
-	if which wget >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
-		wget "$COMPILER_URL" -O "/tmp/$$.zip"
-	elif which curl >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
-		curl -L "$COMPILER_URL" -o "/tmp/$$.zip"
-	else
-		echo "Please download $COMPILER_URL and extract compiler.jar to $JAR_DIR/."
-		exit 1
-	fi
-	(cd $JAR_DIR && unzip "/tmp/$$.zip" && mv "yuicompressor-${VERSION}.jar" "yuicompressor.jar")
-	rm -f "/tmp/$$.zip"
+    if which wget >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
+        wget "$COMPILER_URL" -O "/tmp/$$.zip"
+    elif which curl >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
+        curl -L "$COMPILER_URL" -o "/tmp/$$.zip"
+    else
+        echo "Please download $COMPILER_URL and extract compiler.jar to $JAR_DIR/."
+        exit 1
+    fi
+    (cd $JAR_DIR && unzip "/tmp/$$.zip" && mv "yuicompressor-${VERSION}.jar" "yuicompressor.jar")
+    rm -f "/tmp/$$.zip"
 fi
 
 # compress single file from argument
 if  $# -gt 0 ; then
-	CSS_FILE="$1"
+    CSS_FILE="$1"
 
-	echo "Shrinking $CSS_FILE"
+    echo "Shrinking $CSS_FILE"
     minfile=`echo $CSS_FILE | sed -e 's/\.css$/\.min\.css/'`
-	do_shrink "$CSS_FILE" "$minfile"
-	exit
+    do_shrink "$CSS_FILE" "$minfile"
+    exit
 fi
 
 DIRS="$PWD/../skins/* $PWD/../plugins/* $PWD/../plugins/*/skins/*"

roundcubemail-1.4-rc1.167.tar.gz/bin/decrypt.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/decrypt.sh Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/indexcontacts.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/indexcontacts.sh Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/initdb.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/initdb.sh Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/install-jsdeps.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/install-jsdeps.sh Changed

@@ -23,14 +23,14 @@
 require_once INSTALL_PATH . 'program/include/clisetup.php';
 
 if (!function_exists('exec')) {
-  rcube::raise_error("PHP exec() function is required. Check disable_functions in php.ini.", false, true);
+    rcube::raise_error("PHP exec() function is required. Check disable_functions in php.ini.", false, true);
 }
 
 $cfgfile = INSTALL_PATH . 'jsdeps.json';
 $SOURCES = json_decode(file_get_contents($cfgfile), true);
 
 if (empty($SOURCES'dependencies')) {
-  rcube::raise_error("Failed to read dependencies list from $cfgfile", false, true);
+    rcube::raise_error("Failed to read dependencies list from $cfgfile", false, true);
 }
 
 $CURL     = trim(`which curl`);
@@ -39,13 +39,13 @@
 $FILEINFO = trim(`which file`);
 
 if (($CACHEDIR = getenv("CACHEDIR")) && is_writeable($CACHEDIR)) {
-  // use $CACHEDIR
+    // use $CACHEDIR
 }
 else if (is_writeable(INSTALL_PATH . 'temp/js_cache') || @mkdir(INSTALL_PATH . 'temp/js_cache', 0774, true)) {
-  $CACHEDIR = INSTALL_PATH . 'temp/js_cache';
+    $CACHEDIR = INSTALL_PATH . 'temp/js_cache';
 }
 else {
-  $CACHEDIR = sys_get_temp_dir();
+    $CACHEDIR = sys_get_temp_dir();
 }
 
 
@@ -110,43 +110,43 @@
  */
 function fetch_from_source($package, $useCache = true, &$filetype = null)
 {
-  global $CURL, $WGET;
+    global $CURL, $WGET;
 
-  $cache_file = extract_filetype($package, $filetype);
+    $cache_file = extract_filetype($package, $filetype);
 
-  if (!is_readable($cache_file) || !$useCache) {
-    if (empty($CURL) && empty($WGET)) {
-      rcube::raise_error("Required 'wget' or 'curl' program not found.", false, true);
-    }
+    if (!is_readable($cache_file) || !$useCache) {
+        if (empty($CURL) && empty($WGET)) {
+            rcube::raise_error("Required 'wget' or 'curl' program not found.", false, true);
+        }
 
-    $url = str_replace('$v', $package'version', $package'url');
+        $url = str_replace('$v', $package'version', $package'url');
 
-    echo "Fetching $url\n";
+        echo "Fetching $url\n";
 
-    if ($CURL)
-        exec(sprintf('%s -L -s %s -o %s', $CURL, escapeshellarg($url), $cache_file), $out, $retval);
-    else
-        exec(sprintf('%s -q %s -O %s', $WGET, escapeshellarg($url), $cache_file), $out, $retval);
+        if ($CURL)
+            exec(sprintf('%s -L -s %s -o %s', $CURL, escapeshellarg($url), $cache_file), $out, $retval);
+        else
+            exec(sprintf('%s -q %s -O %s', $WGET, escapeshellarg($url), $cache_file), $out, $retval);
 
-    // Try Github API as a fallback (#6248)
-    if ($retval !== 0 && $package'api_url') {
-      $url    = str_replace('$v', $package'version', $package'api_url');
-      $header = 'Accept:application/vnd.github.v3.raw';
+        // Try Github API as a fallback (#6248)
+        if ($retval !== 0 && $package'api_url') {
+            $url    = str_replace('$v', $package'version', $package'api_url');
+            $header = 'Accept:application/vnd.github.v3.raw';
 
-      rcube::raise_error("Fetching failed. Using Github API on $url");
+            rcube::raise_error("Fetching failed. Using Github API on $url");
 
-      if ($CURL)
-        exec(sprintf('%s -L -H %s -s %s -o %s', $CURL, escapeshellarg($header), escapeshellarg($url), $cache_file), $out, $retval);
-      else
-        exec(sprintf('%s --header %s -q %s -O %s', $WGET, escapeshellarg($header), escapeshellarg($url), $cache_file), $out, $retval);
-    }
+            if ($CURL)
+                exec(sprintf('%s -L -H %s -s %s -o %s', $CURL, escapeshellarg($header), escapeshellarg($url), $cache_file), $out, $retval);
+            else
+                exec(sprintf('%s --header %s -q %s -O %s', $WGET, escapeshellarg($header), escapeshellarg($url), $cache_file), $out, $retval);
+        }
 
-    if ($retval !== 0) {
-      rcube::raise_error("Failed to download source file from $url", false, true);
+        if ($retval !== 0) {
+            rcube::raise_error("Failed to download source file from $url", false, true);
+        }
     }
-  }
 
-  return $cache_file;
+    return $cache_file;
 }
 
 /**
@@ -154,22 +154,22 @@
  */
 function extract_filetype($package, &$filetype = null)
 {
-  global $FILEINFO, $CACHEDIR;
+    global $FILEINFO, $CACHEDIR;
 
-  $filetype   = pathinfo($package'url', PATHINFO_EXTENSION) ?: 'tmp';
-  $cache_file = $CACHEDIR . '/' . $package'lib' . '-' . $package'version' . '.' . $filetype;
+    $filetype   = pathinfo($package'url', PATHINFO_EXTENSION) ?: 'tmp';
+    $cache_file = $CACHEDIR . '/' . $package'lib' . '-' . $package'version' . '.' . $filetype;
 
-  if (empty($FILEINFO)) {
-    rcube::raise_error("Required program 'file' not found.", false, true);
-  }
+    if (empty($FILEINFO)) {
+        rcube::raise_error("Required program 'file' not found.", false, true);
+    }
 
-  // detect downloaded/cached file type
-  exec(sprintf('%s -b %s', $FILEINFO, $cache_file), $out);
-  if (stripos($out0, 'zip') === 0) {
-    $filetype = 'zip';
-  }
+    // detect downloaded/cached file type
+    exec(sprintf('%s -b %s', $FILEINFO, $cache_file), $out);
+    if (stripos($out0, 'zip') === 0) {
+        $filetype = 'zip';
+    }
 
-  return $cache_file;
+    return $cache_file;
 }
 
 /**
@@ -177,38 +177,38 @@
  */
 function compose_destfile($package, $srcfile)
 {
-  global $LICENSES;
-
-  $header = sprintf("/**\n * %s - v%s\n *\n", $package'name', $package'version');
-
-  if (!empty($package'source')) {
-    $header .= " * @source " . str_replace('$v', $package'version', $package'source') . "\n";
-    $header .= " *\n";
-  }
-
-  if (!empty($package'license') && isset($LICENSES$package'license')) {
-    $header .= " * @licstart  The following is the entire license notice for the\n";
-    $header .= " * JavaScript code in this file.\n";
-    $header .= " *\n";
-    if (!empty($package'copyright')) {
-      $header .= " * " . $package'copyright' . "\n";
-      $header .= " *\n";
+    global $LICENSES;
+
+    $header = sprintf("/**\n * %s - v%s\n *\n", $package'name', $package'version');
+
+    if (!empty($package'source')) {
+        $header .= " * @source " . str_replace('$v', $package'version', $package'source') . "\n";
+        $header .= " *\n";
     }
 
-    $header .= $LICENSES$package'license';
-    $header .= " *\n";
-    $header .= " * @licend  The above is the entire license notice\n";
-    $header .= " * for the JavaScript code in this file.\n";
-  }
+    if (!empty($package'license') && isset($LICENSES$package'license')) {
+        $header .= " * @licstart  The following is the entire license notice for the\n";
+        $header .= " * JavaScript code in this file.\n";
+        $header .= " *\n";
+        if (!empty($package'copyright')) {
+            $header .= " * " . $package'copyright' . "\n";
+            $header .= " *\n";
+        }
+
+        $header .= $LICENSES$package'license';
+        $header .= " *\n";
+        $header .= " * @licend  The above is the entire license notice\n";
+        $header .= " * for the JavaScript code in this file.\n";
+    }
 
-  $header .= " */\n";
+    $header .= " */\n";
 
-  if (file_put_contents(INSTALL_PATH . $package'dest', $header . file_get_contents($srcfile))) {
-    echo "Wrote file " . INSTALL_PATH . $package'dest' . "\n";
-  }
-  else {
-    rcube::raise_error("Failed to write destination file " . INSTALL_PATH . $package'dest', false, true);
-  }
+    if (file_put_contents(INSTALL_PATH . $package'dest', $header . file_get_contents($srcfile))) {
+        echo "Wrote file " . INSTALL_PATH . $package'dest' . "\n";
+    }

roundcubemail-1.4-rc1.167.tar.gz/bin/installto.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/installto.sh Changed

@@ -23,118 +23,120 @@
 require_once INSTALL_PATH . 'program/include/clisetup.php';
 
 if (!function_exists('system')) {
-  rcube::raise_error("PHP system() function is required. Check disable_functions in php.ini.", false, true);
+    rcube::raise_error("PHP system() function is required. Check disable_functions in php.ini.", false, true);
 }
 
 $target_dir = unslashify($_SERVER'argv'1);
 
 if (empty($target_dir) || !is_dir(realpath($target_dir)))
-  rcube::raise_error("Invalid target: not a directory\nUsage: installto.sh <TARGET>", false, true);
+    rcube::raise_error("Invalid target: not a directory\nUsage: installto.sh <TARGET>", false, true);
 
 // read version from iniset.php
 $iniset = @file_get_contents($target_dir . '/program/include/iniset.php');
 if (!preg_match('/define\(.RCMAIL_VERSION.,\s*.(0-9.+a-z-*)/', $iniset, $m))
-  rcube::raise_error("No valid Roundcube installation found at $target_dir", false, true);
+    rcube::raise_error("No valid Roundcube installation found at $target_dir", false, true);
 
 $oldversion = $m1;
 
 if (version_compare(version_parse($oldversion), version_parse(RCMAIL_VERSION), '>'))
-  rcube::raise_error("Target installation already in version $oldversion.", false, true);
+    rcube::raise_error("Target installation already in version $oldversion.", false, true);
 
 if (version_compare(version_parse($oldversion), version_parse(RCMAIL_VERSION), '==')) {
-  echo "Target installation already in version $oldversion. Do you want to update again? (y/N)\n";
+    echo "Target installation already in version $oldversion. Do you want to update again? (y/N)\n";
 }
 else {
-  echo "Upgrading from $oldversion. Do you want to continue? (y/N)\n";
+    echo "Upgrading from $oldversion. Do you want to continue? (y/N)\n";
 }
 
 $input = trim(fgets(STDIN));
 
 if (strtolower($input) == 'y') {
-  echo "Copying files to target location...";
-
-  $adds = array();
-  $dirs = array('bin','SQL','plugins','skins','program');
-
-  if (is_dir(INSTALL_PATH . 'vendor') && !is_file("$target_dir/composer.json")) {
-    $dirs = 'vendor';
-  }
-  if (file_exists("$target_dir/installer")) {
-    $dirs = 'installer';
-  }
-
-  foreach ($dirs as $dir) {
-    // @FIXME: should we use --delete for all directories?
-    $delete  = in_array($dir, array('program', 'vendor', 'installer')) ? '--delete ' : '';
-    $command = "rsync -aC --out-format=%n " . $delete . INSTALL_PATH . "$dir/ $target_dir/$dir/";
-    if (system($command, $ret) === false || $ret > 0) {
-      rcube::raise_error("Failed to execute command: $command", false, true);
+    echo "Copying files to target location...";
+
+    $adds = array();
+    $dirs = array('bin','SQL','plugins','skins','program');
+
+    if (is_dir(INSTALL_PATH . 'vendor') && !is_file("$target_dir/composer.json")) {
+        $dirs = 'vendor';
+    }
+    if (file_exists("$target_dir/installer")) {
+        $dirs = 'installer';
+    }
+
+    foreach ($dirs as $dir) {
+        // @FIXME: should we use --delete for all directories?
+        $delete  = in_array($dir, array('program', 'vendor', 'installer')) ? '--delete ' : '';
+        $command = "rsync -aC --out-format=%n " . $delete . INSTALL_PATH . "$dir/ $target_dir/$dir/";
+
+        if (system($command, $ret) === false || $ret > 0) {
+            rcube::raise_error("Failed to execute command: $command", false, true);
+        }
     }
-  }
 
-  foreach (array('index.php','config/defaults.inc.php','composer.json-dist','jsdeps.json','CHANGELOG','README.md','UPGRADING','LICENSE','INSTALL') as $file) {
-    $command = "rsync -a --out-format=%n " . INSTALL_PATH . "$file $target_dir/$file";
-    if (file_exists(INSTALL_PATH . $file) && (system($command, $ret) === false || $ret > 0)) {
-      rcube::raise_error("Failed to execute command: $command", false, true);
+    foreach (array('index.php','config/defaults.inc.php','composer.json-dist','jsdeps.json','CHANGELOG','README.md','UPGRADING','LICENSE','INSTALL') as $file) {
+        $command = "rsync -a --out-format=%n " . INSTALL_PATH . "$file $target_dir/$file";
+
+        if (file_exists(INSTALL_PATH . $file) && (system($command, $ret) === false || $ret > 0)) {
+            rcube::raise_error("Failed to execute command: $command", false, true);
+        }
     }
-  }
-
-  // Copy .htaccess or .user.ini if needed
-  foreach (array('.htaccess','.user.ini') as $file) {
-    if (file_exists(INSTALL_PATH . $file)) {
-      if (!file_exists("$target_dir/$file") || file_get_contents(INSTALL_PATH . $file) != file_get_contents("$target_dir/$file")) {
-        if (copy(INSTALL_PATH . $file, "$target_dir/$file.new")) {
-          echo "$file.new\n";
-          $adds = "NOTICE: New $file file saved as $file.new.";
+
+    // Copy .htaccess or .user.ini if needed
+    foreach (array('.htaccess','.user.ini') as $file) {
+        if (file_exists(INSTALL_PATH . $file)) {
+            if (!file_exists("$target_dir/$file") || file_get_contents(INSTALL_PATH . $file) != file_get_contents("$target_dir/$file")) {
+                if (copy(INSTALL_PATH . $file, "$target_dir/$file.new")) {
+                    echo "$file.new\n";
+                    $adds = "NOTICE: New $file file saved as $file.new.";
+                }
+            }
         }
-      }
     }
-  }
-
-  // remove old (<1.0) .htaccess file
-  @unlink("$target_dir/program/.htaccess");
-  echo "done.\n\n";
-
-  if (is_dir("$target_dir/skins/default")) {
-      echo "Removing old default skin...";
-      system("rm -rf $target_dir/skins/default $target_dir/plugins/jqueryui/themes/default");
-      foreach (glob(INSTALL_PATH . "plugins/*/skins") as $plugin_skin_dir) {
-          $plugin_skin_dir = preg_replace('!^.*' . INSTALL_PATH . '!', '', $plugin_skin_dir);
-          if (is_dir("$target_dir/$plugin_skin_dir/classic"))
-            system("rm -rf $target_dir/$plugin_skin_dir/default");
-      }
-      echo "done.\n\n";
-  }
-
-  // check if js-deps are up-to-date
-  if (file_exists("$target_dir/jsdeps.json") && file_exists("$target_dir/bin/install-jsdeps.sh")) {
-    $jsdeps = json_decode(file_get_contents("$target_dir/jsdeps.json"));
-    $package = $jsdeps->dependencies0;
-    $dest_file = $target_dir . '/' . $package->dest;
-    if (!file_exists($dest_file) || sha1_file($dest_file) !== $package->sha1) {
-        echo "Installing JavaScript dependencies...";
-        system("cd $target_dir && bin/install-jsdeps.sh");
+
+    // remove old (<1.0) .htaccess file
+    @unlink("$target_dir/program/.htaccess");
+    echo "done.\n\n";
+
+    if (is_dir("$target_dir/skins/default")) {
+        echo "Removing old default skin...";
+        system("rm -rf $target_dir/skins/default $target_dir/plugins/jqueryui/themes/default");
+        foreach (glob(INSTALL_PATH . "plugins/*/skins") as $plugin_skin_dir) {
+            $plugin_skin_dir = preg_replace('!^.*' . INSTALL_PATH . '!', '', $plugin_skin_dir);
+            if (is_dir("$target_dir/$plugin_skin_dir/classic")) {
+                system("rm -rf $target_dir/$plugin_skin_dir/default");
+            }
+        }
         echo "done.\n\n";
     }
-  }
-  else {
-    $adds = "NOTICE: JavaScript dependencies installation skipped...";
-  }
-
-  if (file_exists("$target_dir/installer")) {
-    $adds = "NOTICE: The 'installer' directory still exists. You should remove it after the upgrade.";
-  }
-
-  if (!empty($adds)) {
-    echo implode($adds, "\n") . "\n\n";
-  }
-
-  echo "Running update script at target...\n";
-  system("cd $target_dir && php bin/update.sh --version=$oldversion");
-  echo "All done.\n";
+
+    // check if js-deps are up-to-date
+    if (file_exists("$target_dir/jsdeps.json") && file_exists("$target_dir/bin/install-jsdeps.sh")) {
+        $jsdeps    = json_decode(file_get_contents("$target_dir/jsdeps.json"));
+        $package   = $jsdeps->dependencies0;
+        $dest_file = $target_dir . '/' . $package->dest;
+
+        if (!file_exists($dest_file) || sha1_file($dest_file) !== $package->sha1) {
+            echo "Installing JavaScript dependencies...";
+            system("cd $target_dir && bin/install-jsdeps.sh");
+            echo "done.\n\n";
+        }
+    }
+    else {
+        $adds = "NOTICE: JavaScript dependencies installation skipped...";
+    }
+
+    if (file_exists("$target_dir/installer")) {
+        $adds = "NOTICE: The 'installer' directory still exists. You should remove it after the upgrade.";
+    }
+
+    if (!empty($adds)) {
+        echo implode($adds, "\n") . "\n\n";
+    }
+
+    echo "Running update script at target...\n";
+    system("cd $target_dir && php bin/update.sh --version=$oldversion");
+    echo "All done.\n";
 }
 else {
-  echo "Update cancelled. See ya!\n";

roundcubemail-1.4-rc1.167.tar.gz/bin/jsshrink.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/jsshrink.sh Changed

@@ -6,54 +6,54 @@
 CLOSURE_COMPILER_URL='http://dl.google.com/closure-compiler/compiler-latest.zip'
 
 do_shrink() {
-	rm -f "$2"
-	# copy the first comment block with license information for LibreJS
-	grep -q '@lic' $1 && sed -n '/\/\*/,/\*\// { p; /\*\//q; }' $1 > $2
-	java -jar $JAR_DIR/compiler.jar --compilation_level=SIMPLE_OPTIMIZATIONS --js="$1" --language_in="$3" >> $2
+    rm -f "$2"
+    # copy the first comment block with license information for LibreJS
+    grep -q '@lic' $1 && sed -n '/\/\*/,/\*\// { p; /\*\//q; }' $1 > $2
+    java -jar $JAR_DIR/compiler.jar --compilation_level=SIMPLE_OPTIMIZATIONS --js="$1" --language_in="$3" >> $2
 }
 
 if  ! -d "$JS_DIR" ; then
-	echo "Directory $JS_DIR not found."
-	exit 1
+    echo "Directory $JS_DIR not found."
+    exit 1
 fi
 
 if  ! -w "$JAR_DIR" ; then
-	JAR_DIR=$PWD
+    JAR_DIR=$PWD
 fi
 
 if java -version >/dev/null 2>&1; then
-	:
+    :
 else
-	echo "Java not found. Please ensure that the 'java' program is in your PATH."
-	exit 1
+    echo "Java not found. Please ensure that the 'java' program is in your PATH."
+    exit 1
 fi
 
 if  ! -r "$JAR_DIR/compiler.jar" ; then
-	if which wget >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
-		wget "$CLOSURE_COMPILER_URL" -O "/tmp/$$.zip"
-	elif which curl >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
-		curl "$CLOSURE_COMPILER_URL" -o "/tmp/$$.zip"
-	else
-		echo "Please download $CLOSURE_COMPILER_URL and extract compiler.jar to $JAR_DIR/."
-		exit 1
-	fi
-	unzip -p "/tmp/$$.zip" "*.jar" > "$JAR_DIR/compiler.jar"
-	rm -f "/tmp/$$.zip"
+    if which wget >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
+        wget "$CLOSURE_COMPILER_URL" -O "/tmp/$$.zip"
+    elif which curl >/dev/null 2>&1 && which unzip >/dev/null 2>&1; then
+        curl "$CLOSURE_COMPILER_URL" -o "/tmp/$$.zip"
+    else
+        echo "Please download $CLOSURE_COMPILER_URL and extract compiler.jar to $JAR_DIR/."
+        exit 1
+    fi
+    unzip -p "/tmp/$$.zip" "*.jar" > "$JAR_DIR/compiler.jar"
+    rm -f "/tmp/$$.zip"
 fi
 
 # compress single file from argument
 if  $# -gt 0 ; then
-	JS_DIR=`dirname "$1"`
-	JS_FILE="$1"
+    JS_DIR=`dirname "$1"`
+    JS_FILE="$1"
 
-	if  $# -gt 1 ; then
-		LANG_IN="$2"
-	fi
+    if  $# -gt 1 ; then
+        LANG_IN="$2"
+    fi
 
-	echo "Shrinking $JS_FILE"
+    echo "Shrinking $JS_FILE"
     minfile=`echo $JS_FILE | sed -e 's/\.js$/\.min\.js/'`
-	do_shrink "$JS_FILE" "$minfile" "$LANG_IN"
-	exit
+    do_shrink "$JS_FILE" "$minfile" "$LANG_IN"
+    exit
 fi
 
 DIRS="$PWD/../program/js $PWD/../skins/* $PWD/../plugins/* $PWD/../plugins/*/skins/* $PWD/../plugins/managesieve/codemirror/lib"

roundcubemail-1.4-rc1.167.tar.gz/bin/makedoc.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/makedoc.sh Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/moduserprefs.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/moduserprefs.sh Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/msgexport.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/msgexport.sh Changed

@@ -21,89 +21,84 @@
 
 function print_usage()
 {
-	print "Usage:  msgexport -h imap-host -u user-name -m mailbox name\n";
-	print "--host   IMAP host\n";
-	print "--user   IMAP user name\n";
-	print "--mbox   Folder name, set to '*' for all\n";
-	print "--file   Output file\n";
+    print "Usage:  msgexport -h imap-host -u user-name -m mailbox name\n";
+    print "--host   IMAP host\n";
+    print "--user   IMAP user name\n";
+    print "--mbox   Folder name, set to '*' for all\n";
+    print "--file   Output file\n";
 }
 
 function vputs($str)
 {
-	$out = $GLOBALS'args''file' ? STDOUT : STDERR;
-	fwrite($out, $str);
+    $out = $GLOBALS'args''file' ? STDOUT : STDERR;
+    fwrite($out, $str);
 }
 
 function progress_update($pos, $max)
 {
-	$percent = round(100 * $pos / $max);
-	vputs(sprintf("%3d%% %-51s %d/%d\033K\r", $percent, @str_repeat('=', $percent / 2) . '>', $pos, $max));
+    $percent = round(100 * $pos / $max);
+    vputs(sprintf("%3d%% %-51s %d/%d\033K\r", $percent, @str_repeat('=', $percent / 2) . '>', $pos, $max));
 }
 
 function export_mailbox($mbox, $filename)
 {
-	global $IMAP;
+    global $IMAP;
 
-	$IMAP->set_folder($mbox);
+    $IMAP->set_folder($mbox);
 
     $index = $IMAP->index($mbox, null, 'ASC');
     $count = $index->count();
     $index = $index->get();
 
-	vputs("Getting message list of {$mbox}...");
-	vputs("$count messages\n");
-
-	if ($filename)
-	{
-		if (!($out = fopen($filename, 'w')))
-		{
-			vputs("Cannot write to output file\n");
-			return;
-		}
-		vputs("Writing to $filename\n");
-	}
-	else
-		$out = STDOUT;
-
-	for ($i = 0; $i < $count; $i++)
-	{
-		$headers = $IMAP->get_message_headers($index$i);
-		$from = current(rcube_mime::decode_address_list($headers->from, 1, false));
-
-		fwrite($out, sprintf("From %s %s UID %d\n", $from'mailto', $headers->date, $headers->uid));
-		$IMAP->get_raw_body($headers->uid, $out);
-		fwrite($out, "\n\n\n");
-
-		progress_update($i+1, $count);
-	}
-	vputs("\ncomplete.\n");
-
-	if ($filename)
-		fclose($out);
+    vputs("Getting message list of {$mbox}...");
+    vputs("$count messages\n");
+
+    if ($filename) {
+        if (!($out = fopen($filename, 'w'))) {
+            vputs("Cannot write to output file\n");
+            return;
+        }
+        vputs("Writing to $filename\n");
+    }
+    else {
+        $out = STDOUT;
+    }
+
+    for ($i = 0; $i < $count; $i++) {
+        $headers = $IMAP->get_message_headers($index$i);
+        $from = current(rcube_mime::decode_address_list($headers->from, 1, false));
+
+        fwrite($out, sprintf("From %s %s UID %d\n", $from'mailto', $headers->date, $headers->uid));
+        $IMAP->get_raw_body($headers->uid, $out);
+        fwrite($out, "\n\n\n");
+
+        progress_update($i+1, $count);
+    }
+    vputs("\ncomplete.\n");
+
+    if ($filename) {
+        fclose($out);
+    }
 }
 
-
 // get arguments
 $opts = array('h' => 'host', 'u' => 'user', 'p' => 'pass', 'm' => 'mbox', 'f' => 'file');
 $args = rcube_utils::get_opt($opts) + array('host' => 'localhost', 'mbox' => 'INBOX');
 
-if ($_SERVER'argv'1 == 'help')
-{
-	print_usage();
-	exit;
+if ($_SERVER'argv'1 == 'help') {
+    print_usage();
+    exit;
 }
-else if (!$args'host')
-{
-	vputs("Missing required parameters.\n");
-	print_usage();
-	exit;
+else if (!$args'host') {
+    vputs("Missing required parameters.\n");
+    print_usage();
+    exit;
 }
 
 // prompt for username if not set
-if (empty($args'user'))
-{
-	vputs("IMAP user: ");
-	$args'user' = trim(fgets(STDIN));
+if (empty($args'user')) {
+    vputs("IMAP user: ");
+    $args'user' = trim(fgets(STDIN));
 }
 
 // prompt for password
@@ -112,45 +107,39 @@
 
 // parse $host URL
 $a_host = parse_url($args'host');
-if ($a_host'host')
-{
-	$host = $a_host'host';
-	$imap_ssl = (isset($a_host'scheme') && in_array($a_host'scheme', array('ssl','imaps','tls'))) ? TRUE : FALSE;
-	$imap_port = isset($a_host'port') ? $a_host'port' : ($imap_ssl ? 993 : 143);
+if ($a_host'host') {
+    $host      = $a_host'host';
+    $imap_ssl  = (isset($a_host'scheme') && in_array($a_host'scheme', array('ssl','imaps','tls'))) ? TRUE : FALSE;
+    $imap_port = isset($a_host'port') ? $a_host'port' : ($imap_ssl ? 993 : 143);
 }
-else
-{
-	$host = $args'host';
-	$imap_port = 143;
+else {
+    $host = $args'host';
+    $imap_port = 143;
 }
 
 // instantiate IMAP class
 $IMAP = new rcube_imap(null);
 
 // try to connect to IMAP server
-if ($IMAP->connect($host, $args'user', $args'pass', $imap_port, $imap_ssl))
-{
-	vputs("IMAP login successful.\n");
+if ($IMAP->connect($host, $args'user', $args'pass', $imap_port, $imap_ssl)) {
+    vputs("IMAP login successful.\n");
 
-	$filename = null;
-	$mailboxes = $args'mbox' == '*' ? $IMAP->list_folders(null) : array($args'mbox');
+    $filename  = null;
+    $mailboxes = $args'mbox' == '*' ? $IMAP->list_folders(null) : array($args'mbox');
 
-	foreach ($mailboxes as $mbox)
-	{
-		if ($args'file')
-			$filename = preg_replace('/\.a-z0-9{3,4}$/i', '', $args'file') . asciiwords($mbox) . '.mbox';
-		else if ($args'mbox' == '*')
-			$filename = asciiwords($mbox) . '.mbox';
+    foreach ($mailboxes as $mbox) {
+        if ($args'file')
+            $filename = preg_replace('/\.a-z0-9{3,4}$/i', '', $args'file') . asciiwords($mbox) . '.mbox';
+        else if ($args'mbox' == '*')
+            $filename = asciiwords($mbox) . '.mbox';
 
-		if ($args'mbox' == '*' && in_array(strtolower($mbox), array('junk','spam','trash')))
-			continue;
+        if ($args'mbox' == '*' && in_array(strtolower($mbox), array('junk','spam','trash'))) {
+            continue;
+        }
 
-		export_mailbox($mbox, $filename);
-	}
+        export_mailbox($mbox, $filename);
+    }

roundcubemail-1.4-rc1.167.tar.gz/bin/msgimport.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/msgimport.sh Changed

@@ -21,11 +21,11 @@
 
 function print_usage()
 {
-	print "Usage:  msgimport -h imap-host -u user-name -m mailbox -f message-file\n";
-	print "--host   IMAP host\n";
-	print "--user   IMAP user name\n";
-	print "--mbox   Target mailbox\n";
-	print "--file   Message file to upload\n";
+    print "Usage:  msgimport -h imap-host -u user-name -m mailbox -f message-file\n";
+    print "--host   IMAP host\n";
+    print "--user   IMAP user name\n";
+    print "--mbox   Target mailbox\n";
+    print "--file   Message file to upload\n";
 }
 
 
@@ -33,94 +33,80 @@
 $opts = array('h' => 'host', 'u' => 'user', 'p' => 'pass', 'm' => 'mbox', 'f' => 'file');
 $args = rcube_utils::get_opt($opts) + array('host' => 'localhost', 'mbox' => 'INBOX');
 
-if ($_SERVER'argv'1 == 'help')
-{
-	print_usage();
-	exit;
+if ($_SERVER'argv'1 == 'help') {
+    print_usage();
+    exit;
 }
-else if (!($args'host' && $args'file'))
-{
-	print "Missing required parameters.\n";
-	print_usage();
-	exit;
+else if (!($args'host' && $args'file')) {
+    print "Missing required parameters.\n";
+    print_usage();
+    exit;
 }
-else if (!is_file($args'file'))
-{
-	rcube::raise_error("Cannot read message file.", false, true);
+else if (!is_file($args'file')) {
+    rcube::raise_error("Cannot read message file.", false, true);
 }
 
 // prompt for username if not set
-if (empty($args'user'))
-{
-	//fwrite(STDOUT, "Please enter your name\n");
-	echo "IMAP user: ";
-	$args'user' = trim(fgets(STDIN));
+if (empty($args'user')) {
+    //fwrite(STDOUT, "Please enter your name\n");
+    echo "IMAP user: ";
+    $args'user' = trim(fgets(STDIN));
 }
 
 // prompt for password
-if (empty($args'pass'))
-{
-	$args'pass' = rcube_utils::prompt_silent("Password: ");
+if (empty($args'pass')) {
+    $args'pass' = rcube_utils::prompt_silent("Password: ");
 }
 
 // parse $host URL
 $a_host = parse_url($args'host');
-if ($a_host'host')
-{
-	$host = $a_host'host';
-	$imap_ssl = (isset($a_host'scheme') && in_array($a_host'scheme', array('ssl','imaps','tls'))) ? TRUE : FALSE;
-	$imap_port = isset($a_host'port') ? $a_host'port' : ($imap_ssl ? 993 : 143);
+if ($a_host'host') {
+    $host      = $a_host'host';
+    $imap_ssl  = (isset($a_host'scheme') && in_array($a_host'scheme', array('ssl','imaps','tls'))) ? TRUE : FALSE;
+    $imap_port = isset($a_host'port') ? $a_host'port' : ($imap_ssl ? 993 : 143);
 }
-else
-{
-	$host = $args'host';
-	$imap_port = 143;
+else {
+    $host = $args'host';
+    $imap_port = 143;
 }
 
 // instantiate IMAP class
 $IMAP = new rcube_imap(null);
 
 // try to connect to IMAP server
-if ($IMAP->connect($host, $args'user', $args'pass', $imap_port, $imap_ssl))
-{
-	print "IMAP login successful.\n";
-	print "Uploading messages...\n";
-	
-	$count = 0;
-	$message = $lastline = '';
-	
-	$fp = fopen($args'file', 'r');
-	while (($line = fgets($fp)) !== false)
-	{
-		if (preg_match('/^From\s+-/', $line) && $lastline == '')
-		{
-			if (!empty($message))
-			{
-				if ($IMAP->save_message($args'mbox', rtrim($message)))
-					$count++;
-				else
-					rcube::raise_error("Failed to save message to {$args'mbox'}", false, true);
-				$message = '';
-			}
-			continue;
-		}
-
-		$message .= $line;
-		$lastline = rtrim($line);
-	}
-
-	if (!empty($message) && $IMAP->save_message($args'mbox', rtrim($message)))
-		$count++;
-
-	// upload message from file
-	if ($count)
-		print "$count messages successfully added to {$args'mbox'}.\n";
-	else
-		print "Adding messages failed!\n";
+if ($IMAP->connect($host, $args'user', $args'pass', $imap_port, $imap_ssl)) {
+    print "IMAP login successful.\n";
+    print "Uploading messages...\n";
+
+    $count   = 0;
+    $message = $lastline = '';
+
+    $fp = fopen($args'file', 'r');
+    while (($line = fgets($fp)) !== false) {
+        if (preg_match('/^From\s+-/', $line) && $lastline == '') {
+            if (!empty($message)) {
+                if ($IMAP->save_message($args'mbox', rtrim($message)))
+                    $count++;
+                else
+                    rcube::raise_error("Failed to save message to {$args'mbox'}", false, true);
+                $message = '';
+            }
+            continue;
+        }
+
+        $message .= $line;
+        $lastline = rtrim($line);
+    }
+
+    if (!empty($message) && $IMAP->save_message($args'mbox', rtrim($message)))
+        $count++;
+
+    // upload message from file
+    if ($count)
+        print "$count messages successfully added to {$args'mbox'}.\n";
+    else
+        print "Adding messages failed!\n";
 }
-else
-{
-	rcube::raise_error("IMAP login failed.", false, true);
+else {
+    rcube::raise_error("IMAP login failed.", false, true);
 }
-
-?>

roundcubemail-1.4-rc1.167.tar.gz/bin/package2composer.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/package2composer.sh Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/update.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/update.sh Changed

@@ -27,249 +27,262 @@
 
 // ask user if no version is specified
 if (!$opts'version') {
-  echo "What version are you upgrading from? Type '?' if you don't know.\n";
-  if (($input = trim(fgets(STDIN))) && preg_match('/^0-9.+a-z-*$/', $input))
-    $opts'version' = $input;
-  else
-    $opts'version' = RCMAIL_VERSION;
+    echo "What version are you upgrading from? Type '?' if you don't know.\n";
+
+    if (($input = trim(fgets(STDIN))) && preg_match('/^0-9.+a-z-*$/', $input)) {
+        $opts'version' = $input;
+    }
+    else {
+        $opts'version' = RCMAIL_VERSION;
+    }
 }
 
 $RCI = rcmail_install::get_instance();
 $RCI->load_config();
 
 if ($RCI->configured) {
-  $success = true;
-
-  if (($messages = $RCI->check_config()) || $RCI->legacy_config) {
-    $success = false;
-    $err = 0;
-
-    // list old/replaced config options
-    if (is_array($messages'replaced')) {
-      echo "WARNING: Replaced config options:\n";
-      echo "(These config options have been replaced or renamed)\n";
-
-      foreach ($messages'replaced' as $msg) {
-        echo "- '" . $msg'prop' . "' was replaced by '" . $msg'replacement' . "'\n";
-        $err++;
-      }
-      echo "\n";
-    }
-
-    // list obsolete config options (just a notice)
-    if (is_array($messages'obsolete')) {
-      echo "NOTICE: Obsolete config options:\n";
-      echo "(You still have some obsolete or inexistent properties set. This isn't a problem but should be noticed)\n";
+    $success = true;
 
-      foreach ($messages'obsolete' as $msg) {
-        echo "- '" . $msg'prop' . ($msg'name' ? "': " . $msg'name' : "'") . "\n";
-        $err++;
-      }
-      echo "\n";
-    }
+    if (($messages = $RCI->check_config()) || $RCI->legacy_config) {
+        $success = false;
+        $err = 0;
 
-    if (!$err && $RCI->legacy_config) {
-      echo "WARNING: Your configuration needs to be migrated!\n";
-      echo "We changed the configuration files structure and your two config files main.inc.php and db.inc.php have to be merged into one single file.\n";
-      $err++;
-    }
+        // list old/replaced config options
+        if (is_array($messages'replaced')) {
+            echo "WARNING: Replaced config options:\n";
+            echo "(These config options have been replaced or renamed)\n";
 
-    // ask user to update config files
-    if ($err) {
-      if (!$opts'accept') {
-        echo "Do you want me to fix your local configuration? (y/N)\n";
-        $input = trim(fgets(STDIN));
-      }
+            foreach ($messages'replaced' as $msg) {
+                echo "- '" . $msg'prop' . "' was replaced by '" . $msg'replacement' . "'\n";
+                $err++;
+            }
 
-      // positive: let's merge the local config with the defaults
-      if ($opts'accept' || strtolower($input) == 'y') {
-        $error = $written = false;
+            echo "\n";
+        }
 
-        // backup current config
-        echo ". backing up the current config file(s)...\n";
+        // list obsolete config options (just a notice)
+        if (is_array($messages'obsolete')) {
+            echo "NOTICE: Obsolete config options:\n";
+            echo "(You still have some obsolete or inexistent properties set."
+                . " This isn't a problem but should be noticed)\n";
 
-        foreach (array('config', 'main', 'db') as $file) {
-          if (file_exists(RCMAIL_CONFIG_DIR . '/' . $file . '.inc.php')) {
-            if (!copy(RCMAIL_CONFIG_DIR . '/' . $file . '.inc.php', RCMAIL_CONFIG_DIR . '/' . $file . '.old.php')) {
-              $error = true;
+            foreach ($messages'obsolete' as $msg) {
+                echo "- '" . $msg'prop' . ($msg'name' ? "': " . $msg'name' : "'") . "\n";
+                $err++;
             }
-          }
-        }
 
-        if (!$error) {
-          $RCI->merge_config();
-          echo ". writing " . RCMAIL_CONFIG_DIR . "/config.inc.php...\n";
-          $written = $RCI->save_configfile($RCI->create_config());
+            echo "\n";
         }
 
-        // Success!
-        if ($written) {
-          echo "Done.\n";
-          echo "Your configuration files are now up-to-date!\n";
+        if (!$err && $RCI->legacy_config) {
+            echo "WARNING: Your configuration needs to be migrated!\n";
+            echo "We changed the configuration files structure and your two config files "
+                . "main.inc.php and db.inc.php have to be merged into one single file.\n";
+            $err++;
+        }
 
-          if ($messages'missing') {
-            echo "But you still need to add the following missing options:\n";
-            foreach ($messages'missing' as $msg)
-              echo "- '" . $msg'prop' . ($msg'name' ? "': " . $msg'name' : "'") . "\n";
-          }
+        // ask user to update config files
+        if ($err) {
+            if (!$opts'accept') {
+                echo "Do you want me to fix your local configuration? (y/N)\n";
+                $input = trim(fgets(STDIN));
+            }
 
-          if ($RCI->legacy_config) {
-            foreach (array('main', 'db') as $file) {
-              @unlink(RCMAIL_CONFIG_DIR . '/' . $file . '.inc.php');
+            // positive: merge the local config with the defaults
+            if ($opts'accept' || strtolower($input) == 'y') {
+                $error = $written = false;
+
+                echo ". backing up the current config file(s)...\n";
+
+                foreach (array('config', 'main', 'db') as $file) {
+                    if (file_exists(RCMAIL_CONFIG_DIR . '/' . $file . '.inc.php')) {
+                        if (!copy(RCMAIL_CONFIG_DIR . '/' . $file . '.inc.php', RCMAIL_CONFIG_DIR . '/' . $file . '.old.php')) {
+                            $error = true;
+                        }
+                    }
+                }
+
+                if (!$error) {
+                    $RCI->merge_config();
+                    echo ". writing " . RCMAIL_CONFIG_DIR . "/config.inc.php...\n";
+                    $written = $RCI->save_configfile($RCI->create_config());
+                }
+
+                // Success!
+                if ($written) {
+                    echo "Done.\n";
+                    echo "Your configuration files are now up-to-date!\n";
+
+                    if ($messages'missing') {
+                        echo "But you still need to add the following missing options:\n";
+                        foreach ($messages'missing' as $msg) {
+                            echo "- '" . $msg'prop' . ($msg'name' ? "': " . $msg'name' : "'") . "\n";
+                        }
+                    }
+
+                    if ($RCI->legacy_config) {
+                        foreach (array('main', 'db') as $file) {
+                            @unlink(RCMAIL_CONFIG_DIR . '/' . $file . '.inc.php');
+                        }
+                    }
+                }
+                else {
+                    echo "Failed to write config file(s)!\n";
+                    echo "Grant write privileges to the current user or update the files manually "
+                        . "according to the above messages.\n";
+                }
+            }
+            else {
+                echo "Please update your config files manually according to the above messages.\n";
             }
-          }
         }
-        else {
-          echo "Failed to write config file(s)!\n";
-          echo "Grant write privileges to the current user or update the files manually according to the above messages.\n";
+
+        // check dependencies based on the current configuration
+        if (is_array($messages'dependencies')) {
+            echo "WARNING: Dependency check failed!\n";
+            echo "(Some of your configuration settings require other options to be configured "
+                . "or additional PHP modules to be installed)\n";
+
+            foreach ($messages'dependencies' as $msg) {
+                echo "- " . $msg'prop' . ': ' . $msg'explain' . "\n";
+            }
+
+            echo "Please fix your config files and run this script again!\n";

roundcubemail-1.4-rc1.167.tar.gz/bin/updatecss.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/updatecss.sh Changed

roundcubemail-1.4-rc1.167.tar.gz/bin/updatedb.sh -> roundcubemail-1.4-rc1.221.tar.gz/bin/updatedb.sh Changed

roundcubemail-1.4-rc1.167.tar.gz/composer.json-dist -> roundcubemail-1.4-rc1.221.tar.gz/composer.json-dist Changed

roundcubemail-1.4-rc1.167.tar.gz/config/defaults.inc.php -> roundcubemail-1.4-rc1.221.tar.gz/config/defaults.inc.php Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/acl/acl.js -> roundcubemail-1.4-rc1.221.tar.gz/plugins/acl/acl.js Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/acl/acl.php -> roundcubemail-1.4-rc1.221.tar.gz/plugins/acl/acl.php Changed

@@ -407,10 +407,10 @@
         }
         else {
             $items = array(
-                'read' => 'lrs',
-                'write' => 'wi',
+                'read'   => 'lrs',
+                'write'  => 'wi',
                 'delete' => $deleteright,
-                'other' => preg_replace('/lrswi'.$deleteright.'/', '', implode($supported)),
+                'other'  => preg_replace('/lrswi'.$deleteright.'/', '', implode($supported)),
             );
 
             // give plugins the opportunity to adjust this list
@@ -438,14 +438,19 @@
 
             // filter out virtual rights (c or d) the server may return
             $userrights = array_intersect($rights, $supported);
-            $userid = rcube_utils::html_identifier($user);
+            $userid     = rcube_utils::html_identifier($user);
+            $title      = null;
 
             if (!empty($this->specials) && in_array($user, $this->specials)) {
-                $user = $this->gettext($user);
+                $username = $this->gettext($user);
+            }
+            else {
+                $username = $this->resolve_acl_identifier($user, $title);
             }
 
-            $table->add_row(array('id' => 'rcmrow'.$userid));
-            $table->add('user', html::a(array('id' => 'rcmlinkrow'.$userid), rcube::Q($user)));
+            $table->add_row(array('id' => 'rcmrow' . $userid, 'data-userid' => $user));
+            $table->add(array('class' => 'user text-nowrap', 'title' => $title),
+                html::a(array('id' => 'rcmlinkrow' . $userid), rcube::Q($username)));
 
             foreach ($items as $key => $right) {
                 $in = $this->acl_compare($userrights, $right);
@@ -515,9 +520,15 @@
 
             if ($user != $_SESSION'username' && $username != $_SESSION'username') {
                 if ($this->rc->storage->set_acl($mbox, $user, $acl)) {
-                    $ret = array('id' => rcube_utils::html_identifier($user),
-                         'username' => $username, 'acl' => implode($acl), 'old' => $oldid);
-                    $this->rc->output->command('acl_update', $ret);
+                    $display = $this->resolve_acl_identifier($username, $title);
+                    $this->rc->output->command('acl_update', array(
+                            'id'       => rcube_utils::html_identifier($user),
+                            'username' => $username,
+                            'title'    => $title,
+                            'display'  => $display,
+                            'acl'      => implode($acl),
+                            'old'      => $oldid
+                    ));
                     $result++;
                 }
             }
@@ -608,8 +619,9 @@
             }
         }
 
-        if (count($list) == count($supported))
+        if (count($list) == count($supported)) {
             return rcube::Q($this->gettext('aclfull'));
+        }
 
         return html::tag('ul', $attrib, implode("\n", $list));
     }
@@ -636,12 +648,15 @@
         $cnt1 = count($res);
         $cnt2 = count($acl2);
 
-        if ($cnt1 == $cnt2)
+        if ($cnt1 == $cnt2) {
             return 2;
-        else if ($cnt1)
+        }
+
+        if ($cnt1) {
             return 1;
-        else
-            return 0;
+        }
+
+        return 0;
     }
 
     /**
@@ -787,4 +802,51 @@
 
         return $user;
     }
+
+    /**
+     * Resolve acl identifier to user/group name
+     */
+    protected function resolve_acl_identifier($id, &$title = null)
+    {
+        if ($this->init_ldap()) {
+            $groups      = $this->rc->config->get('acl_groups');
+            $prefix      = $this->rc->config->get('acl_group_prefix');
+            $group_field = $this->rc->config->get('acl_group_field', 'name');
+
+            // Unfortunately this works only if group_field=name,
+            // list_groups() allows searching by group name only
+            if ($groups && $prefix && $group_field === 'name' && strpos($id, $prefix) === 0) {
+                $gid    = substr($id, strlen($prefix));
+                $result = $this->ldap->list_groups($gid, rcube_addressbook::SEARCH_STRICT);
+
+                if (count($result) === 1 && ($record = $result0)) {
+                    if ($record$group_field === $gid) {
+                        $display = $record'name';
+                        if ($display != $gid) {
+                            $title = sprintf('%s (%s)', $display, $gid);
+                        }
+
+                        return $display;
+                    }
+                }
+
+                return $id;
+            }
+
+            $this->ldap->set_pagesize('2');
+            // Note: 'uid' works here because we overwrite fieldmap in init_ldap() above
+            $result = $this->ldap->search('uid', $id, rcube_addressbook::SEARCH_STRICT);
+
+            if ($result->count === 1 && ($record = $result->first())) {
+                if ($record'uid' === $id) {
+                    $title   = rcube_addressbook::compose_search_name($record);
+                    $display = rcube_addressbook::compose_list_name($record);
+
+                    return $display;
+                }
+            }
+        }
+
+        return $id;
+    }
 }

roundcubemail-1.4-rc1.167.tar.gz/plugins/acl/composer.json -> roundcubemail-1.4-rc1.221.tar.gz/plugins/acl/composer.json Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/enigma.js -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/enigma.js Changed

@@ -22,7 +22,7 @@
                 {multiselect:true, draggable:false, keyboard:true});
             rcmail.keys_list
                 .addEventListener('select', function(o) { rcmail.enigma_keylist_select(o); })
-                .addEventListener('keypress', function(o) { rcmail.enigma_keylist_keypress(o); })
+                .addEventListener('keypress', function(o) { rcmail.list_keypress(o, {del: 'plugin.enigma-key-delete'}); })
                 .init()
                 .focus();
 
@@ -353,19 +353,6 @@
     this.enable_command('plugin.enigma-key-delete', 'plugin.enigma-key-export-selected', list.get_selection().length > 0);
 };
 
-rcube_webmail.prototype.enigma_keylist_keypress = function(list)
-{
-    if (list.modkey == CONTROL_KEY)
-        return;
-
-    if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
-        this.command('plugin.enigma-key-delete');
-    else if (list.key_pressed == 33)
-        this.command('previouspage');
-    else if (list.key_pressed == 34)
-        this.command('nextpage');
-};
-
 // load key frame
 rcube_webmail.prototype.enigma_loadframe = function(url)
 {

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/lib/enigma_signature.php -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/lib/enigma_signature.php Changed

@@ -28,4 +28,61 @@
     // Set it to true if signature is valid, but part of the message
     // was out of the signed block
     public $partial;
+
+    /**
+     * Find key user id matching the email message sender
+     *
+     * @param enigma_engine $engine  Enigma engine
+     * @param rcube_message $message Message object
+     * @param string        $part_id Message part identifier
+     *
+     * @return string User identifier (name + email)
+     */
+    public function get_sender($engine, $message, $part_id = null)
+    {
+        if (!$this->email) {
+            return $this->name;
+        }
+
+        if ($this->fingerprint && ($key = $engine->get_key($this->fingerprint))) {
+            $from    = $message->headers->from;
+            $charset = $message->charset;
+
+            // Get From: header from the parent part, if it's a forwarded message
+            if ($part_id && strpos($part_id, '.') !== false) {
+                $level = explode('.', $part_id);
+                $parts = $message->mime_parts();
+
+                while (array_pop($level) !== null) {
+                    $parent = join('.', $level);
+                    if ($parts$parent && $parts$parent->mimetype == 'message/rfc822') {
+                        $from    = $parts$parent->headers'from';
+                        $charset = $parts$parent->charset;
+                        break;
+                    }
+                }
+            }
+
+            $from = rcube_mime::decode_address_list($from, 1, true, $charset);
+            $from = (array) $from1;
+
+            if (!empty($from)) {
+                // Compare name and email
+                foreach ($key->users as $user) {
+                    if ($user->name == $from'name' && $user->email == $from'mailto') {
+                        return sprintf('%s <%s>', $user->name, $user->email);
+                    }
+                }
+
+                // Compare only email
+                foreach ($key->users as $user) {
+                    if ($user->email === $from'mailto') {
+                        return sprintf('%s <%s>', $this->name, $user->email);
+                    }
+                }
+            }
+        }
+
+        return sprintf('%s <%s>', $this->name, $this->email);
+    }
 }

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/lib/enigma_ui.php -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/lib/enigma_ui.php Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/classic/templates/keycreate.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/classic/templates/keycreate.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/classic/templates/keyimport.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/classic/templates/keyimport.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/classic/templates/keyinfo.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/classic/templates/keyinfo.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/classic/templates/keys.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/classic/templates/keys.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/classic/templates/keysearch.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/classic/templates/keysearch.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/larry/templates/keycreate.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/larry/templates/keycreate.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/larry/templates/keyimport.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/larry/templates/keyimport.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/larry/templates/keyinfo.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/larry/templates/keyinfo.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/larry/templates/keys.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/larry/templates/keys.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/enigma/skins/larry/templates/keysearch.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/enigma/skins/larry/templates/keysearch.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/help/skins/classic/templates/content.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/help/skins/classic/templates/content.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/help/skins/classic/templates/help.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/help/skins/classic/templates/help.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/help/skins/larry/templates/content.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/help/skins/larry/templates/content.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/help/skins/larry/templates/help.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/help/skins/larry/templates/help.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/managesieve.js -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/managesieve.js Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/classic/templates/filteredit.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/classic/templates/filteredit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/classic/templates/forward.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/classic/templates/forward.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/classic/templates/managesieve.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/classic/templates/managesieve.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/classic/templates/setedit.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/classic/templates/setedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/classic/templates/seteditraw.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/classic/templates/seteditraw.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/classic/templates/vacation.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/classic/templates/vacation.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/larry/templates/filteredit.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/larry/templates/filteredit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/larry/templates/forward.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/larry/templates/forward.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/larry/templates/managesieve.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/larry/templates/managesieve.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/larry/templates/setedit.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/larry/templates/setedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/larry/templates/seteditraw.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/larry/templates/seteditraw.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/managesieve/skins/larry/templates/vacation.html -> roundcubemail-1.4-rc1.221.tar.gz/plugins/managesieve/skins/larry/templates/vacation.html Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/newmail_notifier/newmail_notifier.php -> roundcubemail-1.4-rc1.221.tar.gz/plugins/newmail_notifier/newmail_notifier.php Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/password/config.inc.php.dist -> roundcubemail-1.4-rc1.221.tar.gz/plugins/password/config.inc.php.dist Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/password/drivers/ldap_exop.php -> roundcubemail-1.4-rc1.221.tar.gz/plugins/password/drivers/ldap_exop.php Changed

roundcubemail-1.4-rc1.167.tar.gz/plugins/password/drivers/ldap_ppolicy.php -> roundcubemail-1.4-rc1.221.tar.gz/plugins/password/drivers/ldap_ppolicy.php Changed

@@ -12,6 +12,8 @@
 
 class rcube_ldap_ppolicy_password
 {
+    protected $debug = false;
+
     public function save($currpass, $newpass, $username)
     {
         $rcmail = rcmail::get_instance();
@@ -41,7 +43,15 @@
         );
 
         $cmd = 'plugins/password/helpers/'. $cmd;
-        $this->_debug("parameters:\ncmd:$cmd\nuri:$uri\nbaseDN:$baseDN\nfilter:$filter");
+
+        $this->_debug('Policy request: ' . json_encode(array(
+            'user'   => $username,
+            'cmd'    => $cmd,
+            'uri'    => $uri,
+            'baseDN' => $baseDN,
+            'filter' => $filter,
+        )));
+
         $process = proc_open($cmd, $descriptorspec, $pipes);
 
         if (is_resource($process)) {
@@ -64,7 +74,7 @@
             $result = stream_get_contents($pipes1);
             fclose($pipes1);
 
-            $this->_debug('Result:'.$result);
+            $this->_debug('Policy result: ' . $result);
 
             switch ($result) {
             case "OK":
@@ -89,7 +99,7 @@
     private function _debug($str)
     {
         if ($this->debug) {
-            rcube::write_log('password_ldap_ppolicy', $str);
+            rcube::write_log('ldap', $str);
         }
     }
 }

roundcubemail-1.4-rc1.167.tar.gz/plugins/password/password.php -> roundcubemail-1.4-rc1.221.tar.gz/plugins/password/password.php Changed

@@ -640,6 +640,28 @@
             $prefix  = '{SSHA}';
             break;
 
+        case 'ssha512':
+            $salt = rcube_utils::random_bytes(8);
+
+            if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
+                $salt    = mhash_keygen_s2k(MHASH_SHA512, $password, $salt, 4);
+                $crypted = mhash(MHASH_SHA512, $password . $salt);
+            }
+            else if (function_exists('hash')) {
+                $salt    = substr(pack("H*", hash('sha512', $salt . $password)), 0, 4);
+                $crypted = hash('sha512', $password . $salt, true);
+            }
+            else {
+                rcube::raise_error(array(
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Password plugin: Your PHP install does not have the mhash()/hash() function"
+                ), true, true);
+            }
+
+            $crypted = base64_encode($crypted . $salt);
+            $prefix  = '{SSHA512}';
+            break;
+
         case 'smd5':
             $salt = rcube_utils::random_bytes(8);

roundcubemail-1.4-rc1.167.tar.gz/plugins/password/tests/Password.php -> roundcubemail-1.4-rc1.221.tar.gz/plugins/password/tests/Password.php Changed

roundcubemail-1.4-rc1.167.tar.gz/program/include/rcmail.php -> roundcubemail-1.4-rc1.221.tar.gz/program/include/rcmail.php Changed

@@ -1501,6 +1501,16 @@
             $this->build_folder_tree($a_mailboxes, $folder, $delimiter);
         }
 
+        // allow plugins to alter the folder tree or to localize folder names
+        $hook = $this->plugins->exec_hook('render_folder_selector', array(
+            'list'      => $a_mailboxes,
+            'delimiter' => $delimiter,
+            'attribs'   => $p,
+        ));
+
+        $a_mailboxes = $hook'list';
+        $p           = $hook'attribs';
+
         $select = new html_select($p);
 
         if ($p'noselection') {
@@ -1625,7 +1635,7 @@
             }
 
             $js_name     = $this->JQ($folder'id');
-            $html_name   = $this->Q($foldername) . ($unread ? html::span('unreadcount', sprintf($attrib'unreadwrap', $unread)) : '');
+            $html_name   = $this->Q($foldername) . ($unread ? html::span('unreadcount skip-content', sprintf($attrib'unreadwrap', $unread)) : '');
             $link_attrib = $folder'virtual' ? array() : array(
                 'href'    => $this->url(array('_mbox' => $folder'id')),
                 'onclick' => sprintf("return %s.command('list','%s',this,event)", rcmail_output::JS_OBJECT_NAME, $js_name),

roundcubemail-1.4-rc1.167.tar.gz/program/include/rcmail_output_html.php -> roundcubemail-1.4-rc1.221.tar.gz/program/include/rcmail_output_html.php Changed

@@ -228,9 +228,11 @@
     /**
      * Getter for the current page title
      *
+     * @param bool $full Prepend title with product/user name
+     *
      * @return string The page title
      */
-    protected function get_pagetitle()
+    protected function get_pagetitle($full = true)
     {
         if (!empty($this->pagetitle)) {
             $title = $this->pagetitle;
@@ -245,6 +247,15 @@
             $title = ucfirst($this->env'task');
         }
 
+        if ($full) {
+            if ($this->devel_mode && !empty($_SESSION'username')) {
+                $title = $_SESSION'username' . ' :: ' . $title;
+            }
+            else if ($prod_name = $this->config->get('product_name')) {
+                $title = $prod_name . ' :: ' . $title;
+            }
+        }
+
         return $title;
     }
 
@@ -1374,17 +1385,11 @@
                     $content = html::quote($ver);
                 }
                 else if ($object == 'steptitle') {
-                    $content = html::quote($this->get_pagetitle());
+                    $content = html::quote($this->get_pagetitle(false));
                 }
                 else if ($object == 'pagetitle') {
-                    if ($this->devel_mode && !empty($_SESSION'username'))
-                        $title = $_SESSION'username'.' :: ';
-                    else if ($prod_name = $this->config->get('product_name'))
-                        $title = $prod_name . ' :: ';
-                    else
-                        $title = '';
-                    $title .= $this->get_pagetitle();
-                    $content = html::quote($title);
+                    // Deprecated, <title> will be added automatically
+                    $content = html::quote($this->get_pagetitle());
                 }
                 else if ($object == 'contentframe') {
                     if (empty($attrib'id')) {
@@ -1828,20 +1833,6 @@
             $is_empty = true;
         }
 
-        // set default page title
-        if (empty($this->pagetitle)) {
-            $this->pagetitle = 'Roundcube Mail';
-        }
-
-        // declare page language
-        if (!empty($_SESSION'language')) {
-            $lang = substr($_SESSION'language', 0, 2);
-            $output = preg_replace('/<html/', '<html lang="' . html::quote($lang) . '"', $output, 1);
-            if (!headers_sent()) {
-                header('Content-Language: ' . $lang);
-            }
-        }
-
         $merge_script_files = function($output, $script) {
             return $output . html::script($script);
         };
@@ -1852,22 +1843,42 @@
 
         // put docready commands into page footer
         if (!empty($this->scripts'docready')) {
-            $this->add_script('$(document).ready(function(){ ' . $this->scripts'docready' . "\n});", 'foot');
+            $this->add_script('$(function(){ ' . $this->scripts'docready' . "\n});", 'foot');
         }
 
-        // replace specialchars in content
-        $page_title  = html::quote($this->pagetitle);
         $page_header = '';
         $page_footer = '';
+        $meta        = '';
+
+        // declare page language
+        if (!empty($_SESSION'language')) {
+            $lang   = substr($_SESSION'language', 0, 2);
+            $output = preg_replace('/<html/', '<html lang="' . html::quote($lang) . '"', $output, 1);
+
+            if (!headers_sent()) {
+                header('Content-Language: ' . $lang);
+            }
+        }
 
         // include meta tag with charset
         if (!empty($this->charset)) {
             if (!headers_sent()) {
                 header('Content-Type: text/html; charset=' . $this->charset);
             }
-            $page_header = '<meta http-equiv="content-type"';
-            $page_header.= ' content="text/html; charset=';
-            $page_header.= $this->charset . '" />'."\n";
+
+            $meta .= html::tag('meta', array(
+                    'http-equiv' => 'content-type',
+                    'content'    => "text/html; charset={$this->charset}",
+                    'nl'         => true
+            ));
+        }
+
+        // include page title (after charset specification)
+        $meta .= '<title>' . html::quote($this->get_pagetitle()) . "</title>\n";
+
+        $output = preg_replace('/(<head^>*>)\n*/i', "\\1\n{$meta}", $output, 1, $count);
+        if (!$count) {
+            $page_header .= $meta;
         }
 
         // include scripts into header/footer
@@ -1894,7 +1905,7 @@
                 }
                 $hpos++;
             }
-            $page_header = "<head>\n<title>$page_title</title>\n$page_header\n</head>\n";
+            $page_header = "<head>\n$page_header\n</head>\n";
         }
 
         // add page hader

roundcubemail-1.4-rc1.167.tar.gz/program/js/app.js -> roundcubemail-1.4-rc1.221.tar.gz/program/js/app.js Changed

@@ -269,7 +269,7 @@
           this.message_list
             .addEventListener('initrow', function(o) { ref.init_message_row(o); })
             .addEventListener('dblclick', function(o) { ref.msglist_dbl_click(o); })
-            .addEventListener('keypress', function(o) { ref.msglist_keypress(o); })
+            .addEventListener('keypress', function(o) { ref.list_keypress(o); })
             .addEventListener('select', function(o) { ref.msglist_select(o); })
             .addEventListener('dragstart', function(o) { ref.drag_start(o); })
             .addEventListener('dragmove', function(e) { ref.drag_move(e); })
@@ -509,7 +509,7 @@
             {multiselect:true, draggable:this.gui_objects.folderlist?true:false, keyboard:true});
           this.contact_list
             .addEventListener('initrow', function(o) { ref.triggerEvent('insertrow', { cid:o.uid, row:o }); })
-            .addEventListener('keypress', function(o) { ref.contactlist_keypress(o); })
+            .addEventListener('keypress', function(o) { ref.list_keypress(o); })
             .addEventListener('select', function(o) { ref.contactlist_select(o); })
             .addEventListener('dragstart', function(o) { ref.drag_start(o); })
             .addEventListener('dragmove', function(e) { ref.drag_move(e); })
@@ -588,11 +588,7 @@
             {multiselect:false, draggable:false, keyboard:true});
           this.identity_list
             .addEventListener('select', function(o) { ref.identity_select(o); })
-            .addEventListener('keypress', function(o) {
-              if (o.key_pressed == o.ENTER_KEY) {
-                ref.identity_select(o);
-              }
-            })
+            .addEventListener('keypress', function(o) { ref.list_keypress(o); })
             .init()
             .focus();
         }
@@ -600,7 +596,6 @@
           this.sections_list = new rcube_list_widget(this.gui_objects.sectionslist, {multiselect:false, draggable:false, keyboard:true});
           this.sections_list
             .addEventListener('select', function(o) { ref.section_select(o); })
-            .addEventListener('keypress', function(o) { if (o.key_pressed == o.ENTER_KEY) ref.section_select(o); })
             .init()
             .focus();
         }
@@ -611,6 +606,7 @@
           this.responses_list = new rcube_list_widget(this.gui_objects.responseslist, {multiselect:false, draggable:false, keyboard:true});
           this.responses_list
             .addEventListener('select', function(o) { ref.response_select(o); })
+            .addEventListener('keypress', function(o) { ref.list_keypress(o); })
             .init()
             .focus();
         }
@@ -1901,6 +1897,20 @@
     return true;
   }
 
+  // Common handler for a keypress event on a list widget
+  this.list_keypress = function(list, conf)
+  {
+    if (list.modkey == CONTROL_KEY)
+      return;
+
+    if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
+      this.command(conf && conf.del ? conf.del : 'delete');
+    else if (list.key_pressed == 33)
+      this.command(conf && conf.prev ? conf.prev : 'previouspage');
+    else if (list.key_pressed == 34)
+      this.command(conf && conf.next ? conf.next : 'nextpage');
+  };
+
   this.msglist_select = function(list)
   {
     if (this.preview_timer)
@@ -1966,21 +1976,6 @@
       this.show_message(uid, false, false);
   };
 
-  this.msglist_keypress = function(list)
-  {
-    if (list.modkey == CONTROL_KEY)
-      return;
-
-    if (list.key_pressed == list.ENTER_KEY)
-      this.command('show');
-    else if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
-      this.command('delete');
-    else if (list.key_pressed == 33)
-      this.command('previouspage');
-    else if (list.key_pressed == 34)
-      this.command('nextpage');
-  };
-
   this.msglist_get_preview = function()
   {
     var uid = this.get_single_uid();
@@ -3203,13 +3198,14 @@
     // show wait message
     if (this.env.action == 'show')
       lock = this.set_busy(true, 'movingmessage');
-    else
-      this.show_contentframe(false);
 
     // Hide message command buttons until a message is selected
     this.enable_command(this.env.message_commands, false);
 
     this.with_selected_messages('move', post_data, lock);
+
+    if (this.env.action != 'show')
+      this.show_contentframe(false);
   };
 
   // delete selected messages from the current mailbox
@@ -3252,8 +3248,8 @@
     if (!post_data._uid)
       return;
 
-    this.show_contentframe(false);
     this.with_selected_messages('delete', post_data);
+    this.show_contentframe(false);
   };
 
   // Send a specific move/delete request with UIDs of all selected messages
@@ -3265,7 +3261,8 @@
     // update the list (remove rows, clear selection)
     if (this.message_list) {
       var n, len, id, root, roots = ,
-        selection = post_data._uid;
+        selection = post_data._uid,
+        display_next = this.env.display_next && this.preview_id;
 
       if (selection === '*')
         selection = this.message_list.get_selection();
@@ -3283,11 +3280,13 @@
           }
         }
         if (remove)
-          this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1));
+          this.message_list.remove_row(id, display_next && n == selection.length-1);
       }
+
       // make sure there are no selected rows
-      if (!this.env.display_next && remove)
+      if (!display_next && remove)
         this.message_list.clear_selection();
+
       // update thread tree icons
       for (n=0, len=roots.length; n<len; n++) {
         this.add_tree_icons(rootsn);
@@ -3471,7 +3470,8 @@
       lock = this.display_message('markingmessage', 'loading'),
       list = this.message_list,
       rows = list ? list.rows : {},
-      count = 0;
+      count = 0,
+      display_next = this.env.display_next && this.preview_id;
 
     for (var i=0, len=a_uids.length; i<len; i++) {
       uid = a_uidsi;
@@ -3481,7 +3481,7 @@
 
         if (this.env.skip_deleted) {
           count += this.update_thread(uid);
-          list.remove_row(uid, (this.env.display_next && i == list.get_selection(false).length-1));
+          list.remove_row(uid, display_next && i == list.get_selection(false).length-1);
         }
         else
           this.set_message(uid, 'deleted', true);
@@ -3490,7 +3490,7 @@
 
     // make sure there are no selected rows
     if (this.env.skip_deleted && list) {
-      if (!this.env.display_next || !list.rowcount)
+      if (!display_next || !list.rowcount)
         list.clear_selection();
       if (count < 0)
         post_data._count = (count*-1);
@@ -3977,7 +3977,7 @@
   {
     // query with publickey.js
     var deferreds = ,
-      pk = new PublicKey(),
+      pk = new PublicKey(this.env.keyservers),
       lock = ref.display_message('', 'loading');
 
     $.each(emails, function(i, email) {
@@ -4094,7 +4094,7 @@
     ul.on('click', 'button.importkey', function() {
       var btn = $(this),
         keyid = btn.attr('rel'),
-        pk = new PublicKey(),
+        pk = new PublicKey(ref.env.keyservers),
         lock = ref.display_message('', 'loading');
 
         // fetch from keyserver and import to Mailvelope keyring
@@ -5794,29 +5794,30 @@
     if (id === null || !this.env.contactsid || !this.ksearch_input)
       return;
 
-    var trigger = false, insert = '', delim = ', ';
+    var trigger = false, insert = '', delim = ', ',
+      contact = this.env.contactsid;
 
     this.ksearch_destroy();
 
     // insert all members of a group

roundcubemail-1.4-rc1.167.tar.gz/program/js/list.js -> roundcubemail-1.4-rc1.221.tar.gz/program/js/list.js Changed

roundcubemail-1.4-rc1.167.tar.gz/program/lib/Roundcube/README.md -> roundcubemail-1.4-rc1.221.tar.gz/program/lib/Roundcube/README.md Changed

roundcubemail-1.4-rc1.167.tar.gz/program/lib/Roundcube/bootstrap.php -> roundcubemail-1.4-rc1.221.tar.gz/program/lib/Roundcube/bootstrap.php Changed

roundcubemail-1.4-rc1.167.tar.gz/program/lib/Roundcube/rcube_config.php -> roundcubemail-1.4-rc1.221.tar.gz/program/lib/Roundcube/rcube_config.php Changed

roundcubemail-1.4-rc1.167.tar.gz/program/lib/Roundcube/rcube_image.php -> roundcubemail-1.4-rc1.221.tar.gz/program/lib/Roundcube/rcube_image.php Changed

roundcubemail-1.4-rc1.167.tar.gz/program/lib/Roundcube/rcube_ldap.php -> roundcubemail-1.4-rc1.221.tar.gz/program/lib/Roundcube/rcube_ldap.php Changed

@@ -1006,8 +1006,8 @@
     /**
      * Get a specific contact record
      *
-     * @param mixed   Record identifier
-     * @param boolean Return as associative array
+     * @param mixed   $dn    Record identifier
+     * @param boolean $assoc Return as associative array
      *
      * @return mixed  Hash array or rcube_result_set with all record fields
      */
@@ -1065,8 +1065,9 @@
      * Check the given data before saving.
      * If input not valid, the message to display can be fetched using get_error()
      *
-     * @param array Assoziative array with data to save
-     * @param boolean Try to fix/complete record automatically
+     * @param array   &$save_data Associative array with data to save
+     * @param boolean $autofix    Try to fix/complete record automatically
+     *
      * @return boolean True if input is valid, False if not.
      */
     public function validate(&$save_data, $autofix = false)
@@ -1083,23 +1084,24 @@
         }
 
         // Verify that the required fields are set.
-        $missing = null;
+        $missing   = array();
         $ldap_data = $this->_map_data($save_data);
+
         foreach ($this->prop'required_fields' as $fld) {
             if (!isset($ldap_data$fld) || $ldap_data$fld === '') {
                 $missing$fld = 1;
             }
         }
 
-        if ($missing) {
+        if (!empty($missing)) {
             // try to complete record automatically
             if ($autofix) {
-                $sn_field    = $this->fieldmap'surname';
-                $fn_field    = $this->fieldmap'firstname';
-                $mail_field  = $this->fieldmap'email';
+                $sn_field   = $this->fieldmap'surname';
+                $fn_field   = $this->fieldmap'firstname';
+                $mail_field = $this->fieldmap'email';
 
                 // try to extract surname and firstname from displayname
-                $name_parts  = preg_split('/\s,.+/', $save_data'name');
+                $name_parts = preg_split('/\s,.+/', $save_data'name');
 
                 if ($sn_field && $missing$sn_field) {
                     $save_data'surname' = array_pop($name_parts);
@@ -1135,10 +1137,10 @@
     /**
      * Create a new contact record
      *
-     * @param array Associative array with save data
-     *  Keys:   Field name with optional section in the form FIELD:SECTION
-     *  Values: Field value. Can be either a string or an array of strings for multiple values
-     * @param boolean True to check for duplicates first
+     * @param array $save_cols Associative array with save data
+     *    Keys:   Field name with optional section in the form FIELD:SECTION
+     *    Values: Field value. Can be either a string or an array of strings for multiple values
+     * @param boolean $check True to check for duplicates first
      *
      * @return mixed The created record ID on success, False on error
      */
@@ -1198,8 +1200,9 @@
         $dn = self::dn_encode($dn);
 
         // add new contact to the selected group
-        if ($this->group_id)
+        if ($this->group_id) {
             $this->add_to_group($this->group_id, $dn);
+        }
 
         return $dn;
     }
@@ -1214,17 +1217,15 @@
      */
     function update($id, $save_cols)
     {
-        $record = $this->get_record($id, true);
-
+        $record      = $this->get_record($id, true);
         $newdata     = array();
         $replacedata = array();
         $deletedata  = array();
         $subdata     = array();
         $subdeldata  = array();
         $subnewdata  = array();
-
-        $ldap_data = $this->_map_data($save_cols);
-        $old_data  = $record'_raw_attrib';
+        $ldap_data   = $this->_map_data($save_cols);
+        $old_data    = $record'_raw_attrib';
 
         // special handling of photo col
         if ($photo_fld = $this->fieldmap'photo') {
@@ -1286,9 +1287,9 @@
                         // The data was modified, save it out.
                         $replacedata$fld = $val;
                     }
-                } // end if
-            } // end if
-        } // end foreach
+                }
+            }
+        }
 
         // console($old_data, $ldap_data, '----', $newdata, $replacedata, $deletedata, '----', $subdata, $subnewdata, $subdeldata);
 
@@ -1301,7 +1302,7 @@
                 $this->set_error(self::ERROR_SAVING, 'errorsaving');
                 return false;
             }
-        } // end if
+        }
 
         if (!empty($replacedata)) {
             // Handle RDN change
@@ -1322,7 +1323,7 @@
                     return false;
                 }
             }
-        } // end if
+        }
 
         // RDN change, we need to remove all sub-entries
         if (!empty($newrdn)) {
@@ -1346,7 +1347,7 @@
                 $this->set_error(self::ERROR_SAVING, 'errorsaving');
                 return false;
             }
-        } // end if
+        }
 
         // Handle RDN change
         if (!empty($newrdn)) {
@@ -1398,7 +1399,7 @@
         if (!is_array($ids)) {
             // Not an array, break apart the encoded DNs.
             $ids = explode(',', $ids);
-        } // end if
+        }
 
         foreach ($ids as $id) {
             $dn = self::dn_decode($id);
@@ -1423,13 +1424,14 @@
 
             // remove contact from all groups where he was a member
             if ($this->groups) {
-                $dn = self::dn_encode($dn);
+                $dn        = self::dn_encode($dn);
                 $group_ids = $this->get_record_groups($dn);
+
                 foreach (array_keys($group_ids) as $group_id) {
                     $this->remove_from_group($group_id, $dn);
                 }
             }
-        } // end foreach
+        }
 
         return count($ids);
     }
@@ -1478,7 +1480,7 @@
             $attrvals'{'.$k.'}' = is_array($v) ? $v0 : $v;
         }
 
-        foreach ((array)$this->prop'autovalues' as $lf => $templ) {
+        foreach ((array) $this->prop'autovalues' as $lf => $templ) {
             if (empty($attrs$lf)) {
                 if (strpos($templ, '(') !== false) {
                     // replace {attr} placeholders with (escaped!) attribute values to be safely eval'd
@@ -1514,16 +1516,17 @@
      */
     private function _ldap2result($rec)
     {
-        $out = array('_type' => 'person');
+        $out      = array('_type' => 'person');
         $fieldmap = $this->fieldmap;
 
-        if ($rec'dn')
+        if ($rec'dn') {
             $out$this->primary_key = self::dn_encode($rec'dn');
+        }
 
         // determine record type
         if ($this->is_group_entry($rec)) {
-            $out'_type' = 'group';
-            $out'readonly' = true;
+            $out'_type'     = 'group';
+            $out'readonly'  = true;
             $fieldmap'name' = $this->group_data'name_attr' ?: $this->prop'groups''name_attr';
         }
 
@@ -1537,8 +1540,7 @@
             }

roundcubemail-1.4-rc1.167.tar.gz/program/lib/Roundcube/rcube_mime.php -> roundcubemail-1.4-rc1.221.tar.gz/program/lib/Roundcube/rcube_mime.php Changed

@@ -712,9 +712,8 @@
     {
         static $mime_ext = array();
 
-        $mime_type  = null;
-        $config     = rcube::get_instance()->config;
-        $mime_magic = $config->get('mime_magic');
+        $mime_type = null;
+        $config    = rcube::get_instance()->config;
 
         if (!$skip_suffix && empty($mime_ext)) {
             foreach ($config->resolve_paths('mimetypes.php') as $fpath) {
@@ -731,6 +730,7 @@
 
         // try fileinfo extension if available
         if (!$mime_type && function_exists('finfo_open')) {
+            $mime_magic = $config->get('mime_magic');
             // null as a 2nd argument should be the same as no argument
             // this however is not true on all systems/versions
             if ($mime_magic) {
@@ -741,10 +741,8 @@
             }
 
             if ($finfo) {
-                if ($is_stream)
-                    $mime_type = finfo_buffer($finfo, $path, FILEINFO_MIME_TYPE);
-                else
-                    $mime_type = finfo_file($finfo, $path, FILEINFO_MIME_TYPE);
+                $func      = $is_stream ? 'finfo_buffer' : 'finfo_file';
+                $mime_type = $func($finfo, $path, FILEINFO_MIME_TYPE);
                 finfo_close($finfo);
             }
         }

roundcubemail-1.4-rc1.167.tar.gz/program/lib/Roundcube/rcube_plugin.php -> roundcubemail-1.4-rc1.221.tar.gz/program/lib/Roundcube/rcube_plugin.php Changed

roundcubemail-1.4-rc1.167.tar.gz/program/lib/Roundcube/rcube_utils.php -> roundcubemail-1.4-rc1.221.tar.gz/program/lib/Roundcube/rcube_utils.php Changed

@@ -700,16 +700,20 @@
      */
     public static function request_header($name)
     {
-        if (function_exists('getallheaders')) {
-            $hdrs = array_change_key_case(getallheaders(), CASE_UPPER);
-            $key  = strtoupper($name);
+        if (function_exists('apache_request_headers')) {
+            $headers = apache_request_headers();
+            $key     = strtoupper($name);
         }
         else {
-            $key  = 'HTTP_' . strtoupper(strtr($name, '-', '_'));
-            $hdrs = array_change_key_case($_SERVER, CASE_UPPER);
+            $headers = $_SERVER;
+            $key     = 'HTTP_' . strtoupper(strtr($name, '-', '_'));
         }
 
-        return $hdrs$key;
+        if (!empty($headers)) {
+            $headers = array_change_key_case($headers, CASE_UPPER);
+
+            return $headers$key;
+        }
     }
 
     /**
@@ -957,11 +961,13 @@
 
         if ($is_utf) {
             if (preg_match('/^\x20-\x7E/', $domain)) {
-                $domain = idn_to_ascii($domain, $options, $variant);
+                $options = defined('IDNA_NONTRANSITIONAL_TO_ASCII') ? IDNA_NONTRANSITIONAL_TO_ASCII : 0;
+                $domain  = idn_to_ascii($domain, $options, $variant);
             }
         }
         else if (preg_match('/(^|\.)xn--/i', $domain)) {
-            $domain = idn_to_utf8($domain, $options, $variant);
+            $options = defined('IDNA_NONTRANSITIONAL_TO_UNICODE') ? IDNA_NONTRANSITIONAL_TO_UNICODE : 0;
+            $domain  = idn_to_utf8($domain, $options, $variant);
         }
 
         if ($domain === false) {

roundcubemail-1.4-rc1.167.tar.gz/program/localization/en_US/labels.inc -> roundcubemail-1.4-rc1.221.tar.gz/program/localization/en_US/labels.inc Changed

roundcubemail-1.4-rc1.167.tar.gz/program/steps/addressbook/func.inc -> roundcubemail-1.4-rc1.221.tar.gz/program/steps/addressbook/func.inc Changed

@@ -76,14 +76,15 @@
         }
     }
 
-    $search_mods = $RCMAIL->config->get('addressbook_search_mods', $SEARCH_MODS_DEFAULT);
-    $OUTPUT->set_env('search_mods', $search_mods);
+    $OUTPUT->set_env('display_next', (bool) $RCMAIL->config->get('display_next'));
+    $OUTPUT->set_env('search_mods', $RCMAIL->config->get('addressbook_search_mods', $SEARCH_MODS_DEFAULT));
     $OUTPUT->set_env('address_sources', $js_list);
     $OUTPUT->set_env('writable_source', $writeable);
     $OUTPUT->set_env('contact_move_enabled', $writeable > 1);
     $OUTPUT->set_env('contact_copy_enabled', $writeable > 1 || ($writeable == 1 && count($js_list) > 1));
 
     $OUTPUT->set_pagetitle($RCMAIL->gettext('contacts'));
+
     $_SESSION'addressbooks_count' = $count;
     $_SESSION'addressbooks_count_writeable' = $writeable;
 
@@ -921,7 +922,9 @@
         $photo_img = $attrib'placeholder' ? $RCMAIL->output->abs_url($attrib'placeholder', true) : 'program/resources/blank.gif';
     }
 
-    $RCMAIL->output->set_env('photo_placeholder', $RCMAIL->output->asset_url($photo_img));
+    $photo_img = $RCMAIL->output->asset_url($photo_img);
+
+    $RCMAIL->output->set_env('photo_placeholder', $photo_img);
 
     unset($attrib'placeholder');

roundcubemail-1.4-rc1.167.tar.gz/program/steps/mail/compose.inc -> roundcubemail-1.4-rc1.221.tar.gz/program/steps/mail/compose.inc Changed

@@ -92,6 +92,7 @@
 $OUTPUT->set_env('save_localstorage', (bool)$RCMAIL->config->get('compose_save_localstorage'));
 $OUTPUT->set_env('is_sent', false);
 $OUTPUT->set_env('mimetypes', rcmail_supported_mimetypes());
+$OUTPUT->set_env('keyservers', $RCMAIL->config->keyservers());
 
 $drafts_mbox     = $RCMAIL->config->get('drafts_mbox');
 $config_show_sig = $RCMAIL->config->get('show_sig', 1);
@@ -334,10 +335,8 @@
     // clean HTML message body which can be submitted by URL
     if (!empty($COMPOSE'param''body')) {
         if ($COMPOSE'param''html' = strpos($COMPOSE'param''body', '<') !== false) {
-            $wash_params = array('safe' => false, 'inline_html' => true);
-            $COMPOSE'param''body' = rcmail_wash_html($COMPOSE'param''body', $wash_params, array());
-            $COMPOSE'param''body' = preg_replace('//',
-                // remove <body> tags
-                '/<body(^>*)>/i',
-                '/<\/body>/i',
-                // convert TinyMCE's empty-line sequence (#1490463)
-                '/<p>\xC2\xA0<\/p>/',
-            ),
-            array(
-                '',
-                '',
-                '',
-                '<p><br /></p>',
-            ),
-            $body
-        );
-
-        // replace cid with href in inline images links
-        if (!empty($cid_map)) {
-            $body = str_replace(array_keys($cid_map), array_values($cid_map), $body);
-        }
+    // Return the draft body as-is
+    return $body;
+}
+
+// Clean up HTML content of Draft/Reply/Forward (part of the message)
+function rcmail_prepare_html_body($body, $wash_params = array())
+{
+    global $CID_MAP, $MESSAGE, $COMPOSE;
+    static $part_no;
+
+    // Set attributes of the part container
+    $container_id     = $COMPOSE'mode' . 'body' . (++$part_no);
+    $container_attrib = array('id' => $container_id);
+
+    $body_args = array(
+        'safe'             => $MESSAGE->is_safe,
+        'plain'            => false,
+        'css_prefix'       => 'v' . $part_no,
+    );
+
+    // remove comments (produced by washtml)
+    $replace = array('//' => '');
+
+    if ($COMPOSE'mode' == rcmail_sendmail::MODE_DRAFT) {
+        // convert TinyMCE's empty-line sequence (#1490463)
+        $replace'/<p>\xC2\xA0<\/p>/' = '<p><br /></p>';
+        // remove <body> tags
+        $replace'/<body(^>*)>/i' = '';
+        $replace'/<\/body>/i'      = '';
+    }
+    else {
+        $body_args'container_id'     = $container_id;
+        $body_args'container_attrib' = $container_attrib;
+    }
+
+    // Make the HTML content safe and clean
+    $body = rcmail_wash_html($body, $wash_params + $body_args, $CID_MAP);
+    $body = preg_replace(array_keys($replace), array_values($replace), $body);
+    $body = rcmail_html4inline($body, $body_args);
+
+    if ($COMPOSE'mode' != rcmail_sendmail::MODE_DRAFT) {
+        $body =  html::div($container_attrib, $body);

roundcubemail-1.4-rc1.167.tar.gz/program/steps/mail/func.inc -> roundcubemail-1.4-rc1.221.tar.gz/program/steps/mail/func.inc Changed

@@ -1083,13 +1083,13 @@
 /**
  * Modify a HTML message that it can be displayed inside a HTML page
  */
-function rcmail_html4inline($body, $args)
+function rcmail_html4inline($body, &$args)
 {
     $last_pos = 0;
     $cont_id  = $args'container_id' . ($args'body_class' ? ' div.' . $args'body_class' : '');
 
     // find STYLE tags
-    while (($pos = stripos($body, '<style', $last_pos)) && ($pos2 = stripos($body, '</style>', $pos))) {
+    while (($pos = stripos($body, '<style', $last_pos)) !== false && ($pos2 = stripos($body, '</style>', $pos+1))) {
         $pos = strpos($body, '>', $pos) + 1;
         $len = $pos2 - $pos;
 
@@ -1101,37 +1101,22 @@
         $last_pos = $pos2 + strlen($styles) - $len;
     }
 
-    $body = preg_replace(array(
-            // add comments around html and other tags
-            '/(<!DOCTYPE^>*>)/i',
-            '/(<\?xml^>*>)/i',
-            '/(<\/?html^>*>)/i',
-            '/(<\/?head^>*>)/i',
-            '/(<title^>*>.*<\/title>)/Ui',
-            '/(<\/?meta^>*>)/i',
-            // quote <? of php and xml files that are specified as text/html
-            '/<\?/',
-            '/\?>/',
-            // replace <body> with <div>
-            '/<body(^>*)>/i',
-            '/<\/body>/i',
-        ),
-        array(
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '&lt;?',
-            '?&gt;',
-            '<div class="' . $args'body_class' . '"\\1>',
-            '</div>',
-        ),
-        $body);
+    $replace = array(
+        // add comments around html and other tags
+        '/(<!DOCTYPE^>*>)/i'          => '',
+        '/(<\?xml^>*>)/i'             => '',
+        '/(<\/?html^>*>)/i'           => '',
+        '/(<\/?head^>*>)/i'           => '',
+        '/(<title^>*>.*<\/title>)/Ui' => '',
+        '/(<\/?meta^>*>)/i'           => '',
+        // quote <? of php and xml files that are specified as text/html
+        '/<\?/' => '&lt;?',
+        '/\?>/' => '?&gt;',
+    );
+
+    $regexp = '/<body(^>*)/';
 
     // Handle body attributes that doesn't play nicely with div elements
-    $regexp = '/<div class="' . preg_quote($args'body_class', '/') . '"(^>*)/';
     if (preg_match($regexp, $body, $m)) {
         $style = array();
         $attrs = $m0;
@@ -1139,13 +1124,13 @@
         // Get bgcolor, we'll set it as background-color of the message container
         if ($m1 && preg_match('/bgcolor="\'*(a-z0-9#+)"\'*/i', $attrs, $mb)) {
             $style'background-color' = $mb1;
-            $attrs = preg_replace('/bgcolor="\'*a-z0-9#+"\'*/i', '', $attrs);
+            $attrs = preg_replace('/\s?bgcolor="\'*a-z0-9#+"\'*/i', '', $attrs);
         }
 
         // Get background, we'll set it as background-image of the message container
         if ($m1 && preg_match('/background="\'*(^"\'>\s+)"\'*/', $attrs, $mb)) {
             $style'background-image' = 'url('.$mb1.')';
-            $attrs = preg_replace('/background="\'*(^"\'>\s+)"\'*/', '', $attrs);
+            $attrs = preg_replace('/\s?background="\'*(^"\'>\s+)"\'*/', '', $attrs);
         }
 
         if (!empty($style)) {
@@ -1171,15 +1156,28 @@
                 $style$idx = $idx . ': ' . $val;
             }
 
-            $attributes'style' = implode('; ', $style);
+            $args'container_attrib''style' = implode('; ', $style);
         }
+
+        // replace <body> with <div>
+        if (!empty($args'body_class')) {
+            $replace'/<body(^>*)>/i' = '<div class="' . $args'body_class' . '"\\1>';
+        }
+        else {
+            $replace'/<body/i' = '<div';
+        }
+
+        $replace'/<\/body>/i' = '</div>';
     }
     // make sure there's 'rcmBody' div, we need it for proper css modification
     // its name is hardcoded in rcmail_message_body() also
-    else {
+    else if (!empty($args'body_class')) {
         $body = '<div class="' . $args'body_class' . '">' . $body . '</div>';
     }
 
+    // Clean up, and replace <body> with <div>
+    $body = preg_replace(array_keys($replace), array_values($replace), $body);
+
     return $body;
 }

roundcubemail-1.4-rc1.167.tar.gz/program/steps/mail/get.inc -> roundcubemail-1.4-rc1.221.tar.gz/program/steps/mail/get.inc Changed

roundcubemail-1.4-rc1.167.tar.gz/program/steps/mail/list.inc -> roundcubemail-1.4-rc1.221.tar.gz/program/steps/mail/list.inc Changed

roundcubemail-1.4-rc1.167.tar.gz/program/steps/mail/show.inc -> roundcubemail-1.4-rc1.221.tar.gz/program/steps/mail/show.inc Changed

@@ -242,8 +242,9 @@
     $attrib'class' = 'notice';
     $attrib'style' = 'display: none';
 
-    $msg = html::span(null, rcube::Q($RCMAIL->gettext('blockedresources'))) . '&nbsp;'
-        . html::a(array(
+    $msg = html::span(null, rcube::Q($RCMAIL->gettext('blockedresources')));
+
+    $buttons = html::a(array(
             'href'    => "#loadremote",
             'onclick' => rcmail_output::JS_OBJECT_NAME.".command('load-remote')"
         ),
@@ -251,7 +252,7 @@
 
     // add link to save sender in addressbook and reload message
     if ($MESSAGE->sender'mailto' && $RCMAIL->config->get('show_images') == 1) {
-        $msg .= ' ' . html::a(array(
+        $buttons .= ' ' . html::a(array(
                 'href'    => "#loadremotealways",
                 'onclick' => rcmail_output::JS_OBJECT_NAME.".command('load-remote', true)",
                 'style'   => "white-space:nowrap"
@@ -261,7 +262,7 @@
 
     $RCMAIL->output->add_gui_object('remoteobjectsmsg', $attrib'id');
 
-    return html::div($attrib, $msg);
+    return html::div($attrib, $msg . '&nbsp;' . html::span('boxbuttons', $buttons));
 }
 
 function rcmail_message_buttons()
@@ -656,7 +657,7 @@
                 }
 
                 $plugin = $RCMAIL->plugins->exec_hook('message_body_prefix',
-                    array('part' => $part, 'prefix' => ''));
+                    array('part' => $part, 'prefix' => '', 'message' => $MESSAGE));
 
                 // Set attributes of the part container
                 $container_class  = $part->ctype_secondary == 'html' ? 'message-htmlpart' : 'message-part';
@@ -684,7 +685,7 @@
                     $body = rcmail_html4inline($body, $body_args);
                 }
 
-                $out .= html::div($container_attrib, $plugin'prefix' . $body);
+                $out .= html::div($body_args'container_attrib', $plugin'prefix' . $body);
             }
         }
     }

roundcubemail-1.4-rc1.167.tar.gz/program/steps/settings/func.inc -> roundcubemail-1.4-rc1.221.tar.gz/program/steps/settings/func.inc Changed

@@ -281,6 +281,21 @@
                 );
             }
 
+            // "display after delete" checkbox
+            if (!isset($no_override'display_next')) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_displaynext';
+                $input    = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));
+
+                $blocks'main''options''display_next' = array(
+                    'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('displaynext'))),
+                    'content' => $input->show($config'display_next'?1:0),
+                );
+            }
+
             if (!isset($no_override'refresh_interval')) {
                 if (!$current) {
                     continue 2;
@@ -604,21 +619,6 @@
                     'content' => $input->show($config'inline_images'?1:0),
                 );
             }
-
-            // "display after delete" checkbox
-            if (!isset($no_override'display_next')) {
-                if (!$current) {
-                    continue 2;
-                }
-
-                $field_id = 'rcmfd_displaynext';
-                $input    = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));
-
-                $blocks'main''options''display_next' = array(
-                    'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('displaynext'))),
-                    'content' => $input->show($config'display_next'?1:0),
-                );
-            }
         break;
 
         // Mail composition

roundcubemail-1.4-rc1.167.tar.gz/program/steps/settings/save_prefs.inc -> roundcubemail-1.4-rc1.221.tar.gz/program/steps/settings/save_prefs.inc Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/about.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/about.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/addressbook.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/addressbook.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/bounce.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/bounce.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/compose.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/compose.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/contact.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/contact.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/contactadd.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/contactadd.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/contactedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/contactedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/contactprint.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/contactprint.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/contactsearch.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/contactsearch.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/error.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/error.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/folderedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/folderedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/folders.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/folders.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/identities.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/identities.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/identityedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/identityedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/importcontacts.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/importcontacts.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/login.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/login.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/mail.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/mail.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/message.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/message.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/messageerror.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/messageerror.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/messagepart.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/messagepart.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/messagepreview.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/messagepreview.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/messageprint.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/messageprint.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/plugin.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/plugin.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/responseedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/responseedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/responses.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/responses.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/settings.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/settings.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/classic/templates/settingsedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/classic/templates/settingsedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/fa-regular-400.woff -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/fa-regular-400.woff Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/fa-regular-400.woff2 -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/fa-regular-400.woff2 Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/fa-solid-900.woff -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/fa-solid-900.woff Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/fonts/fa-solid-900.woff2 -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/fa-solid-900.woff2 Changed

roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/roboto-v19-italic-700.woff Added

roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/roboto-v19-italic-700.woff2 Added

roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/roboto-v19-italic.woff Added

roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/roboto-v19-italic.woff2 Added

roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/roboto-v19-regular-700.woff Added

roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/roboto-v19-regular-700.woff2 Added

roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/roboto-v19-regular.woff Added

roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/fonts/roboto-v19-regular.woff2 Added

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/images/contactgroup.svg -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/images/contactgroup.svg Changed

@@ -1,11 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 640 640" style="enable-background:new 0 0 640 640; background-color: #f2f2f2;" xml:space="preserve">
-<path style="fill:#cccccc;" d="M133.5,273.5c30.3,0,55-24.7,55-55s-24.7-55-55-55s-55,24.7-55,55S103.2,273.5,133.5,273.5z M518.5,273.5
-	c30.3,0,55-24.7,55-55s-24.7-55-55-55s-55,24.7-55,55S488.2,273.5,518.5,273.5z M546,301h-55c-15.1,0-28.8,6.1-38.8,16
-	c34.6,19,59.2,53.3,64.5,94h56.7c15.2,0,27.5-12.3,27.5-27.5V356C601,325.7,576.3,301,546,301z M326,301c53.2,0,96.2-43.1,96.2-96.2
-	s-43.1-96.2-96.2-96.2s-96.2,43.1-96.2,96.2S272.8,301,326,301z M392,328.5h-7.1c-17.9,8.6-37.7,13.8-58.9,13.8s-40.9-5.2-58.9-13.8
-	H260c-54.7,0-99,44.3-99,99v24.8c0,22.8,18.5,41.2,41.2,41.2h247.5c22.8,0,41.2-18.5,41.2-41.2v-24.8
-	C491,372.8,446.7,328.5,392,328.5z M199.8,317c-10-9.9-23.6-16-38.8-16h-55c-30.3,0-55,24.7-55,55v27.5c0,15.2,12.3,27.5,27.5,27.5
-	h56.6C140.5,370.3,165.1,336,199.8,317L199.8,317z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" style="background-color:#f4f4f4">
+  <path d="M133.5 273.5c30.3 0 55-24.7 55-55s-24.7-55-55-55-55 24.7-55 55 24.7 55 55 55zm385 0c30.3 0 55-24.7 55-55s-24.7-55-55-55-55 24.7-55 55 24.7 55 55 55zM546 301h-55c-15.1 0-28.8 6.1-38.8 16 34.6 19 59.2 53.3 64.5 94h56.7c15.2 0 27.5-12.3 27.5-27.5V356c.1-30.3-24.6-55-54.9-55zm-220 0c53.2 0 96.2-43.1 96.2-96.2s-43.1-96.2-96.2-96.2-96.2 43.1-96.2 96.2 43 96.2 96.2 96.2zm66 27.5h-7.1c-17.9 8.6-37.7 13.8-58.9 13.8s-40.9-5.2-58.9-13.8H260c-54.7 0-99 44.3-99 99v24.8c0 22.8 18.5 41.2 41.2 41.2h247.5c22.8 0 41.2-18.5 41.2-41.2v-24.8c.1-54.7-44.2-99-98.9-99zM199.8 317c-10-9.9-23.6-16-38.8-16h-55c-30.3 0-55 24.7-55 55v27.5c0 15.2 12.3 27.5 27.5 27.5h56.6c5.4-40.7 30-75 64.7-94z" fill="#ccc"/>
 </svg>

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/images/contactpic.svg -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/images/contactpic.svg Changed

@@ -1,7 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512; background-color: #f2f2f2;" xml:space="preserve">
-<path style="fill:#cccccc;" d="M256,246c50.5,0,91.4-40.9,91.4-91.4S306.5,63.1,256,63.1s-91.4,40.9-91.4,91.4S205.5,246,256,246z M320,268.9
-	h-11.9c-15.9,7.3-33.5,11.4-52.1,11.4s-36.1-4.1-52.1-11.4H192c-53,0-96,43-96,96v29.7c0,18.9,15.4,34.3,34.3,34.3h251.4
-	c18.9,0,34.3-15.4,34.3-34.3v-29.7C416,311.9,373,268.9,320,268.9z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="background-color:#f4f4f4">
+  <path d="M256 246c50.5 0 91.4-40.9 91.4-91.4S306.5 63.1 256 63.1s-91.4 40.9-91.4 91.4S205.5 246 256 246zm64 22.9h-11.9c-15.9 7.3-33.5 11.4-52.1 11.4s-36.1-4.1-52.1-11.4H192c-53 0-96 43-96 96v29.7c0 18.9 15.4 34.3 34.3 34.3h251.4c18.9 0 34.3-15.4 34.3-34.3v-29.7c0-53-43-96-96-96z" fill="#ccc"/>
 </svg>

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/images/corner-handle.svg -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/images/corner-handle.svg Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/images/logo.svg -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/images/logo.svg Changed

@@ -1,15 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="9.14 141.8 573.65 573.65">
-<style type="text/css">
-.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#404F54;}
-.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#E5E5E5;}
-.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#CCCCCC;}
-.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#37BEFF;}
-</style>
-<polygon class="st3" points="582.79,549.77 295.96,384.1 295.96,207.27 582.79,372.95 "/>
-<polygon class="st0" points="9.14,549.77 295.96,384.1 295.96,207.27 9.14,372.95 "/>
-<path class="st2" d="M295.96,141.8c109.56,0,198.41,88.85,198.41,198.41c0,109.56-88.85,198.41-198.41,198.41 c-109.56,0-198.41-88.85-198.41-198.41C97.55,230.65,186.4,141.8,295.96,141.8"/>
-<path class="st1" d="M295.96,141.8c109.6,0,198.48,88.85,198.48,198.41c0,109.56-88.88,198.41-198.48,198.41	c-62.91-42.34-88.94-127.64-88.94-198.3S233.05,184.22,295.96,141.8"/>
-<polygon class="st3" points="582.79,372.95 295.96,538.62 295.96,715.45 582.79,549.77 "/>
-<polygon class="st0" points="9.14,372.95 295.96,538.62 295.96,715.45 9.14,549.77 "/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="9.14 141.8 573.65 573.65">
+  <style>
+    .st0,.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#404f54}.st3{fill:#37beff}
+  </style>
+  <path class="st3" d="M582.79 549.77L295.96 384.1V207.27l286.83 165.68z"/>
+  <path class="st0" d="M9.14 549.77L295.96 384.1V207.27L9.14 372.95z"/>
+  <path d="M295.96 141.8c109.56 0 198.41 88.85 198.41 198.41s-88.85 198.41-198.41 198.41S97.55 449.77 97.55 340.21 186.4 141.8 295.96 141.8" fill-rule="evenodd" clip-rule="evenodd" fill="#ccc"/>
+  <path d="M295.96 141.8c109.6 0 198.48 88.85 198.48 198.41s-88.88 198.41-198.48 198.41c-62.91-42.34-88.94-127.64-88.94-198.3s26.03-156.1 88.94-198.52" fill-rule="evenodd" clip-rule="evenodd" fill="#e5e5e5"/>
+  <path class="st3" d="M582.79 372.95L295.96 538.62v176.83l286.83-165.68z"/>
+  <path class="st0" d="M9.14 372.95l286.82 165.67v176.83L9.14 549.77z"/>
 </svg>

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/colors.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/colors.less Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/fontawesome.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/fontawesome.less Changed

@@ -3,9 +3,10 @@
 
 @fa-font-path:        "../webfonts";
 @fa-font-size-base:   16px;
+@fa-font-display:     auto;
 @fa-line-height-base: 1;
 @fa-css-prefix:       fa;
-@fa-version:          "5.6.3";
+@fa-version:          "5.9.0";
 @fa-border-color:     #eee;
 @fa-inverse:          #fff;
 @fa-li-width:         2em;
@@ -23,6 +24,7 @@
 @fa-var-adversal: "\f36a";
 @fa-var-affiliatetheme: "\f36b";
 @fa-var-air-freshener: "\f5d0";
+@fa-var-airbnb: "\f834";
 @fa-var-algolia: "\f36c";
 @fa-var-align-center: "\f037";
 @fa-var-align-justify: "\f039";
@@ -92,7 +94,10 @@
 @fa-var-baby-carriage: "\f77d";
 @fa-var-backspace: "\f55a";
 @fa-var-backward: "\f04a";
+@fa-var-bacon: "\f7e5";
 @fa-var-balance-scale: "\f24e";
+@fa-var-balance-scale-left: "\f515";
+@fa-var-balance-scale-right: "\f516";
 @fa-var-ban: "\f05e";
 @fa-var-band-aid: "\f462";
 @fa-var-bandcamp: "\f2d5";
@@ -106,6 +111,7 @@
 @fa-var-battery-half: "\f242";
 @fa-var-battery-quarter: "\f243";
 @fa-var-battery-three-quarters: "\f241";
+@fa-var-battle-net: "\f835";
 @fa-var-bed: "\f236";
 @fa-var-beer: "\f0fc";
 @fa-var-behance: "\f1b4";
@@ -115,6 +121,7 @@
 @fa-var-bezier-curve: "\f55b";
 @fa-var-bible: "\f647";
 @fa-var-bicycle: "\f206";
+@fa-var-biking: "\f84a";
 @fa-var-bimobject: "\f378";
 @fa-var-binoculars: "\f1e5";
 @fa-var-biohazard: "\f780";
@@ -139,21 +146,28 @@
 @fa-var-bong: "\f55c";
 @fa-var-book: "\f02d";
 @fa-var-book-dead: "\f6b7";
+@fa-var-book-medical: "\f7e6";
 @fa-var-book-open: "\f518";
 @fa-var-book-reader: "\f5da";
 @fa-var-bookmark: "\f02e";
+@fa-var-bootstrap: "\f836";
+@fa-var-border-all: "\f84c";
+@fa-var-border-none: "\f850";
+@fa-var-border-style: "\f853";
 @fa-var-bowling-ball: "\f436";
 @fa-var-box: "\f466";
 @fa-var-box-open: "\f49e";
 @fa-var-boxes: "\f468";
 @fa-var-braille: "\f2a1";
 @fa-var-brain: "\f5dc";
+@fa-var-bread-slice: "\f7ec";
 @fa-var-briefcase: "\f0b1";
 @fa-var-briefcase-medical: "\f469";
 @fa-var-broadcast-tower: "\f519";
 @fa-var-broom: "\f51a";
 @fa-var-brush: "\f55d";
 @fa-var-btc: "\f15a";
+@fa-var-buffer: "\f837";
 @fa-var-bug: "\f188";
 @fa-var-building: "\f1ad";
 @fa-var-bullhorn: "\f0a1";
@@ -223,6 +237,7 @@
 @fa-var-check-circle: "\f058";
 @fa-var-check-double: "\f560";
 @fa-var-check-square: "\f14a";
+@fa-var-cheese: "\f7ef";
 @fa-var-chess: "\f439";
 @fa-var-chess-bishop: "\f43a";
 @fa-var-chess-board: "\f43c";
@@ -241,10 +256,12 @@
 @fa-var-chevron-up: "\f077";
 @fa-var-child: "\f1ae";
 @fa-var-chrome: "\f268";
+@fa-var-chromecast: "\f838";
 @fa-var-church: "\f51d";
 @fa-var-circle: "\f111";
 @fa-var-circle-notch: "\f1ce";
 @fa-var-city: "\f64f";
+@fa-var-clinic-medical: "\f7f2";
 @fa-var-clipboard: "\f328";
 @fa-var-clipboard-check: "\f46c";
 @fa-var-clipboard-list: "\f46d";
@@ -278,6 +295,7 @@
 @fa-var-comment-alt: "\f27a";
 @fa-var-comment-dollar: "\f651";
 @fa-var-comment-dots: "\f4ad";
+@fa-var-comment-medical: "\f7f5";
 @fa-var-comment-slash: "\f4b3";
 @fa-var-comments: "\f086";
 @fa-var-comments-dollar: "\f653";
@@ -317,6 +335,7 @@
 @fa-var-crosshairs: "\f05b";
 @fa-var-crow: "\f520";
 @fa-var-crown: "\f521";
+@fa-var-crutch: "\f7f7";
 @fa-var-css3: "\f13c";
 @fa-var-css3-alt: "\f38b";
 @fa-var-cube: "\f1b2";
@@ -389,6 +408,7 @@
 @fa-var-ebay: "\f4f4";
 @fa-var-edge: "\f282";
 @fa-var-edit: "\f044";
+@fa-var-egg: "\f7fb";
 @fa-var-eject: "\f052";
 @fa-var-elementor: "\f430";
 @fa-var-ellipsis-h: "\f141";
@@ -408,6 +428,7 @@
 @fa-var-ethernet: "\f796";
 @fa-var-etsy: "\f2d7";
 @fa-var-euro-sign: "\f153";
+@fa-var-evernote: "\f839";
 @fa-var-exchange-alt: "\f362";
 @fa-var-exclamation: "\f12a";
 @fa-var-exclamation-circle: "\f06a";
@@ -424,6 +445,7 @@
 @fa-var-facebook-f: "\f39e";
 @fa-var-facebook-messenger: "\f39f";
 @fa-var-facebook-square: "\f082";
+@fa-var-fan: "\f863";
 @fa-var-fantasy-flight-games: "\f6dc";
 @fa-var-fast-backward: "\f049";
 @fa-var-fast-forward: "\f050";
@@ -520,6 +542,7 @@
 @fa-var-gift: "\f06b";
 @fa-var-gifts: "\f79c";
 @fa-var-git: "\f1d3";
+@fa-var-git-alt: "\f841";
 @fa-var-git-square: "\f1d2";
 @fa-var-github: "\f09b";
 @fa-var-github-alt: "\f113";
@@ -582,12 +605,14 @@
 @fa-var-hacker-news: "\f1d4";
 @fa-var-hacker-news-square: "\f3af";
 @fa-var-hackerrank: "\f5f7";
+@fa-var-hamburger: "\f805";
 @fa-var-hammer: "\f6e3";
 @fa-var-hamsa: "\f665";
 @fa-var-hand-holding: "\f4bd";
 @fa-var-hand-holding-heart: "\f4be";
 @fa-var-hand-holding-usd: "\f4c0";
 @fa-var-hand-lizard: "\f258";
+@fa-var-hand-middle-finger: "\f806";
 @fa-var-hand-paper: "\f256";
 @fa-var-hand-peace: "\f25b";
 @fa-var-hand-point-down: "\f0a7";
@@ -602,6 +627,7 @@
 @fa-var-hands-helping: "\f4c4";
 @fa-var-handshake: "\f2b5";
 @fa-var-hanukiah: "\f6e6";
+@fa-var-hard-hat: "\f807";
 @fa-var-hashtag: "\f292";
 @fa-var-hat-wizard: "\f6e8";
 @fa-var-haykal: "\f666";
@@ -631,6 +657,7 @@
 @fa-var-hospital-alt: "\f47d";
 @fa-var-hospital-symbol: "\f47e";
 @fa-var-hot-tub: "\f593";
+@fa-var-hotdog: "\f80f";
 @fa-var-hotel: "\f594";
 @fa-var-hotjar: "\f3b1";
 @fa-var-hourglass: "\f254";
@@ -643,7 +670,9 @@
 @fa-var-html5: "\f13b";
 @fa-var-hubspot: "\f3b2";
 @fa-var-i-cursor: "\f246";
+@fa-var-ice-cream: "\f810";
 @fa-var-icicles: "\f7ad";
+@fa-var-icons: "\f86d";
 @fa-var-id-badge: "\f2c1";
 @fa-var-id-card: "\f2c2";
 @fa-var-id-card-alt: "\f47f";
@@ -663,6 +692,7 @@
 @fa-var-invision: "\f7b0";
 @fa-var-ioxhost: "\f208";
 @fa-var-italic: "\f033";
+@fa-var-itch-io: "\f83a";
 @fa-var-itunes: "\f3b4";
 @fa-var-itunes-note: "\f3b5";
 @fa-var-java: "\f4e4";
@@ -695,6 +725,7 @@
 @fa-var-language: "\f1ab";
 @fa-var-laptop: "\f109";
 @fa-var-laptop-code: "\f5fc";
+@fa-var-laptop-medical: "\f812";
 @fa-var-laravel: "\f3bd";

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/global.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/global.less Changed

@@ -35,8 +35,8 @@
   font-style: normal;
   font-weight: 400;
   src: local('Roboto'), local('Roboto-Regular'),
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-regular.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-regular.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
+       url('../fonts/roboto-v19-regular.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
+       url('../fonts/roboto-v19-regular.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
 }
 
 @font-face {
@@ -44,8 +44,8 @@
   font-style: italic;
   font-weight: 400;
   src: local('Roboto Italic'), local('Roboto-Italic'),
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-italic.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-italic.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
+       url('../fonts/roboto-v19-italic.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
+       url('../fonts/roboto-v19-italic.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
 }
 
 @font-face {
@@ -53,8 +53,8 @@
   font-style: normal;
   font-weight: 700;
   src: local('Roboto Bold'), local('Roboto-Bold'),
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
+       url('../fonts/roboto-v19-regular-700.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
+       url('../fonts/roboto-v19-regular-700.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
 }
 
 @font-face {
@@ -62,8 +62,8 @@
   font-style: italic;
   font-weight: 700;
   src: local('Roboto Bold Italic'), local('Roboto-BoldItalic'),
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700italic.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700italic.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
+       url('../fonts/roboto-v19-italic-700.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
+       url('../fonts/roboto-v19-italic-700.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
 }
 
 /* Reset some Bootstrap style */

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/layout.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/layout.less Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/styles.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/styles.less Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/variables.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/variables.less Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/widgets/forms.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/widgets/forms.less Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/widgets/jqueryui.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/widgets/jqueryui.less Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/widgets/menu.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/widgets/menu.less Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/styles/widgets/messages.less -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/styles/widgets/messages.less Changed

@@ -27,7 +27,6 @@
 
     @media screen and (max-width: @screen-width-xs) {
         border: 0;
-        min-height: 4.2rem;
     }
 
     span {
@@ -92,6 +91,29 @@
         content: @fa-var-comment;
     }
 
+    // #6797: Fix for long buttons issue
+    .boxbuttons {
+        white-space: nowrap;
+
+        .btn {
+            .overflow-ellipsis;
+            max-width: 220px;
+        }
+
+        @media screen and (max-width: @screen-width-xs) {
+            display: flex;
+            flex-direction: column;
+
+            .btn {
+                max-width: 160px;
+
+                &:not(:first-child) {
+                    margin-top: .25rem;
+                }
+            }
+        }
+    }
+
     // This works with following structure: <i> <span> button.
     // <span> here is a one-line text, and button can be anything but <span>.
     &.aligned-buttons {
@@ -176,6 +198,7 @@
         @media screen and (max-width: @screen-width-xs) {
             margin: 0;
             border-radius: 0;
+            min-height: 4.2rem;
         }
 
         &.voice {
@@ -194,10 +217,6 @@
         &:last-child {
             margin-bottom: 0;
         }
-
-        @media screen and (max-width: @screen-width-xs) {
-            margin: 0;
-        }
     }
 
     .loading {

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/templates/includes/layout.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/templates/includes/layout.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/templates/includes/settings-menu.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/templates/includes/settings-menu.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/templates/settings.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/templates/settings.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/elastic/ui.js -> roundcubemail-1.4-rc1.221.tar.gz/skins/elastic/ui.js Changed

@@ -1169,26 +1169,21 @@
         // display or reset the content frame
         var common_content_handler = function(e, href, show, title)
         {
-            if (is_mobile()) {
+            if (is_mobile() && env.frame_nav) {
                 content_frame_navigation(href, e);
             }
 
             if (show && !layout.content.is(':visible')) {
                 env.last_selected = layout.content0;
-                screen_resize();
-
-                if (title) {
-                    title_reset(title);
-                }
             }
-            else if (!show) {
-                if (env.last_selected != last_selected && !env.content_lock) {
-                    env.last_selected = last_selected;
-                    screen_resize();
-                }
-                title_reset();
+            else if (!show && env.last_selected != last_selected && !env.content_lock) {
+                env.last_selected = last_selected;
             }
 
+            screen_resize();
+
+            title_reset(title && show ? title : null);
+
             env.content_lock = false;
         };
 
@@ -1251,7 +1246,7 @@
                 common_list_handler(e);
             })
             .addEventListener('show-content', function(e) {
-                if (!$(e.obj).is('iframe')) {
+                if (e.obj && !$(e.obj).is('iframe')) {
                     $(e.scrollElement || e.obj).scrollTop(0);
                     if (is_mobile()) {
                         iframe_loader(e.obj);
@@ -1576,6 +1571,7 @@
     function screen_resize()
     {
         if (is_framed && !layout.sidebar.length && !layout.list.length) {
+            screen_resize_headers();
             return;
         }
 
@@ -1588,11 +1584,10 @@
 
         screen_resize_logo(mode);
         screen_resize_headers();
-/*
-        // On iOS and Android the content frame height is never correct, fix it
-        // Actually I needed it for my iPad with iOS 9.3. We'll re-consider
-        // uncommenting that if we know more recent devices need it
-        if (bw.webkit) {
+
+        // On iOS and Android the content frame height is never correct, fix it.
+        // Actually I observed the issue on my old iPad with iOS 9.3.
+        if (bw.webkit && bw.ipad && bw.agent.match(/OS 9/)) {
             $('.iframe-wrapper').each(function() {
                 var h = $(this).height();
                 if (h) {
@@ -1600,7 +1595,6 @@
                 }
             });
         }
-*/
     };
 
     /**
@@ -2846,7 +2840,7 @@
         $.each('open', 'download', 'rename', function() {
             var action = this;
             $('#attachmenu' + action, obj).off('click').attr('onclick', '').click(function(e) {
-                rcmail.command(action + '-attachment', id, this, e.originalEvent);
+                return rcmail.command(action + '-attachment', id, this, e.originalEvent);
             });
         });
 
@@ -2893,7 +2887,8 @@
         obj.find('a').off('click').removeClass('active');
 
         if (rcmail.env.has_writeable_addressbook) {
-            $('.addressbook', obj).addClass('active').on('click', function(e) {
+            $('.addressbook', obj).addClass('active')
+                .on('click', function(e) {
                     var i, contact = mailto,
                         txt = $(button).filter('.rcmContactAddress').text();
 
@@ -2904,7 +2899,7 @@
                         contact = '"' + $.trim(txt) + '" <' + contact + '>';
                     }
 
-                    rcmail.command('add-contact', contact, this, e.originalEvent);
+                    return rcmail.command('add-contact', contact, this, e.originalEvent);
                 });
         }
 
@@ -2919,6 +2914,8 @@
             else {
                 rcmail.command('compose', mailto, this, e.originalEvent);
             }
+
+            return false; // for Chrome
         });
 
         return rcmail.command('menu-open', {menu: 'mailto-menu', link: button}, button, event.originalEvent);
@@ -3060,7 +3057,7 @@
      */
     function recipient_input(obj)
     {
-        var list, input, ac_props, update_lock,
+        var list, input, ac_props,
             input_len_update = function() {
                 input.css('width', Math.max(40, input.val().length * 15 + 25));
             },
@@ -3068,9 +3065,6 @@
                 // update the original input
                 $(obj).val(list.text() + input.val());
             },
-            focus_func = function() {
-                list.addClass('focus');
-            },
             insert_recipient = function(name, email, replace) {
                 var recipient = $('<li class="recipient">'),
                     name_element = $('<span class="name">').html(recipient_input_name(name || email))
@@ -3101,12 +3095,6 @@
             update_func = function(text) {
                 var result;
 
-                if (update_lock) {
-                    return;
-                }
-
-                update_lock = true;
-
                 text = (text || input.val()).replace(/,;\s+$/, '');
                 result = recipient_input_parser(text);
 
@@ -3120,31 +3108,19 @@
                         input.val(result.text);
                         apply_func();
                         input_len_update();
-                        update_lock = false;
                     }, 1);
 
                 return result.recipients.length > 0;
             },
             parse_func = function(e) {
-                if (e.type == 'blur') {
-                    list.removeClass('focus');
-                }
-
-                // FIXME: This is a workaround for a bug where on a touch device
-                // selecting a recipient from autocomplete list do not work because
-                // of some events race condition (?)
-                if (this.value.indexOf('@') < 0) {
-                    return;
-                }
-
                 // On paste the text is not yet in the input we have to use clipboard.
                 // Also because on paste new-line characters are replaced by spaces (#6460)
-                update_func(e.type == 'paste' ? (e.originalEvent.clipboardData || window.clipboardData).getData('text') : null);
+                update_func(e.type == 'paste' ? (e.originalEvent.clipboardData || window.clipboardData).getData('text') : this.value);
             },
             keydown_func = function(e) {
                 // On Backspace remove the last recipient
                 if (e.keyCode == 8 && !input.val().length) {
-                    list.children('li.recipient').first().remove();
+                    list.children('li.recipient').last().remove();
                     apply_func();
                     return false;
                 }
@@ -3160,10 +3136,11 @@
 
         // Create the input element and "editable" area
         input = $('<input>').attr({type: 'text', tabindex: $(obj).attr('tabindex')})
-            .on('paste change blur', parse_func)
+            .on('paste change', parse_func)
             .on('input', input_len_update) // only to fix input length after paste
             .on('keydown', keydown_func)
-            .on('focus mousedown', focus_func);
+            .on('blur', function() { list.removeClass('focus'); })
+            .on('focus mousedown', function() { list.addClass('focus'); });
 
         list = $('<ul>').addClass('form-control recipient-input')
             .append($('<li>').append(input))
@@ -3323,16 +3300,19 @@
     function image_upload_input(obj)
     {
         var reset_button = $('<a>')
-            .attr({'class': 'icon button delete', href: '#', })
-            .click(function(e) { rcmail.command('delete-photo', '', this, e); return false; });
+                .attr({'class': 'icon button delete', href: '#', })
+                .click(function(e) { rcmail.command('delete-photo', '', this, e); return false; }),

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/about.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/about.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/addressbook.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/addressbook.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/bounce.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/bounce.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/compose.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/compose.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/contact.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/contact.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/contactedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/contactedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/contactprint.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/contactprint.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/contactsearch.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/contactsearch.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/error.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/error.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/folderedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/folderedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/folders.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/folders.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/identities.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/identities.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/identityedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/identityedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/importcontacts.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/importcontacts.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/login.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/login.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/mail.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/mail.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/message.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/message.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/messageerror.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/messageerror.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/messagepart.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/messagepart.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/messagepreview.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/messagepreview.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/messageprint.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/messageprint.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/plugin.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/plugin.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/responseedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/responseedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/responses.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/responses.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/settings.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/settings.html Changed

roundcubemail-1.4-rc1.167.tar.gz/skins/larry/templates/settingsedit.html -> roundcubemail-1.4-rc1.221.tar.gz/skins/larry/templates/settingsedit.html Changed

roundcubemail-1.4-rc1.167.tar.gz/tests/Framework/Utils.php -> roundcubemail-1.4-rc1.221.tar.gz/tests/Framework/Utils.php Changed

roundcubemail-1.4-rc1.167.tar.gz/tests/MailFunc.php -> roundcubemail-1.4-rc1.221.tar.gz/tests/MailFunc.php Changed

@@ -41,8 +41,10 @@
         $part = $this->get_html_part('src/htmlbody.txt');
         $part->replaces = array('ex1.jpg' => 'part_1.2.jpg', 'ex2.jpg' => 'part_1.2.jpg');
 
+        $params = array('container_id' => 'foo');
+
         // render HTML in normal mode
-        $html = rcmail_html4inline(rcmail_print_body($part->body, $part, array('safe' => false)), array('container_id' => 'foo'));
+        $html = rcmail_html4inline(rcmail_print_body($part->body, $part, array('safe' => false)), $params);
 
         $this->assertRegExp('/src="'.$part->replaces'ex1.jpg'.'"/', $html, "Replace reference to inline image");
         $this->assertRegExp('#background="program/resources/blocked.gif"#', $html, "Replace external background image");
@@ -56,7 +58,7 @@
         $this->assertTrue($GLOBALS'REMOTE_OBJECTS', "Remote object detected");
 
         // render HTML in safe mode
-        $html2 = rcmail_html4inline(rcmail_print_body($part->body, $part, array('safe' => true)), array('container_id' => 'foo'));
+        $html2 = rcmail_html4inline(rcmail_print_body($part->body, $part, array('safe' => true)), $params);
 
         $this->assertRegExp('/<style ^>+>/', $html2, "Allow styles in safe mode");
         $this->assertRegExp('#src="http://evilsite.net/mailings/ex3.jpg"#', $html2, "Allow external images in HTML (safe mode)");
@@ -77,7 +79,9 @@
         $this->assertNotRegExp('/\sona-z+/', $washed, "Remove on* attributes");
         $this->assertNotContains('onload', $washed, "Handle invalid style");
 
-        $html = rcmail_html4inline($washed, array('container_id' => 'foo'));
+        $params = array('container_id' => 'foo');
+        $html   = rcmail_html4inline($washed, $params);
+
         $this->assertNotRegExp('/onclick="return rcmail.command(\'compose\',\'xss@somehost.net\',this)"/', $html, "Clean mailto links");
         $this->assertNotRegExp('/alert/', $html, "Remove alerts");
     }
@@ -88,9 +92,9 @@
      */
     function test_html_xss2()
     {
-        $part = $this->get_html_part('src/BID-26800.txt');
-        $washed = rcmail_html4inline(rcmail_print_body($part->body, $part, array('safe' => true)),
-             array('container_id' => 'dabody', 'safe' => true));
+        $part   = $this->get_html_part('src/BID-26800.txt');
+        $params = array('container_id' => 'dabody', 'safe' => true);
+        $washed = rcmail_html4inline(rcmail_print_body($part->body, $part, array('safe' => true)), $params);
 
         $this->assertNotRegExp('/alert|expression|javascript|xss/', $washed, "Remove evil style blocks");
         $this->assertNotRegExp('/font-style:italic/', $washed, "Allow valid styles");
@@ -111,6 +115,20 @@
     }
 
     /**
+     * Test handling of body style attributes
+     */
+    function test_html4inline_body_style()
+    {
+        $html   = '<body background="test" bgcolor="#fff" style="font-size:11px"><p>test</p></body>';
+        $params = array('container_id' => 'foo');
+        $html   = rcmail_html4inline($html, $params);
+
+        $this->assertRegExp('/<div style="font-size:11px">/', $html, "Body attributes");
+        $this->assertArrayHasKey('container_attrib', $params, "'container_attrib' param set");
+        $this->assertSame('background-color: #fff; background-image: url(test)', $params'container_attrib''style', "Body style");
+    }
+
+    /**
      * Test washtml class on non-unicode characters (#1487813)
      * @group iconv
      * @group mbstring
@@ -177,9 +195,10 @@
     function test_mailto()
     {
         $part = $this->get_html_part('src/mailto.txt');
+        $params = array('container_id' => 'foo');
 
         // render HTML in normal mode
-        $html = rcmail_html4inline(rcmail_print_body($part->body, $part, array('safe' => false)), array('container_id' => 'foo'));
+        $html = rcmail_html4inline(rcmail_print_body($part->body, $part, array('safe' => false)), $params);
 
         $mailto = '<a href="mailto:me@me.com"'
             .' onclick="return rcmail.command(\'compose\',\'me@me.com?subject=this is the subject&amp;body=this is the body\',this)" rel="noreferrer">e-mail</a>';

roundcubemail.dsc Changed

Changes of Revision 84