summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG15
-rw-r--r--plugins/help/skins/larry/help.pngbin6099 -> 2876 bytes
-rw-r--r--[-rwxr-xr-x]plugins/jqueryui/themes/larry/images/animated-overlay.gifbin1738 -> 1738 bytes
-rw-r--r--plugins/jqueryui/themes/larry/images/ui-dialog-close.pngbin1596 -> 644 bytes
-rw-r--r--plugins/jqueryui/themes/larry/images/ui-icons-datepicker.pngbin437 -> 323 bytes
-rw-r--r--[-rwxr-xr-x]plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.pngbin4369 -> 3395 bytes
-rw-r--r--[-rwxr-xr-x]plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.pngbin4369 -> 3378 bytes
-rw-r--r--plugins/managesieve/managesieve.js3
-rw-r--r--plugins/password/drivers/ldap.php2
-rw-r--r--plugins/password/password.php4
-rw-r--r--program/include/rcmail.php2
-rw-r--r--program/lib/Roundcube/rcube_imap_generic.php10
-rw-r--r--program/lib/Roundcube/rcube_plugin_api.php10
-rw-r--r--skins/larry/images/buttons.pngbin16644 -> 15699 bytes
-rw-r--r--skins/larry/images/contactgroup.pngbin2104 -> 957 bytes
-rw-r--r--skins/larry/images/contactpic_32px.pngbin287 -> 274 bytes
-rw-r--r--skins/larry/images/filedrop.pngbin605 -> 421 bytes
-rw-r--r--skins/larry/images/filetypes.pngbin9018 -> 4626 bytes
-rw-r--r--skins/larry/images/listicons.pngbin29198 -> 13442 bytes
-rw-r--r--skins/larry/images/login_shadow.pngbin1069 -> 789 bytes
-rw-r--r--skins/larry/images/messages.pngbin1736 -> 1461 bytes
-rw-r--r--skins/larry/images/messages_dark.pngbin1779 -> 1471 bytes
-rw-r--r--skins/larry/images/overflowshadow.pngbin307 -> 250 bytes
-rw-r--r--skins/larry/images/quota.pngbin3622 -> 2033 bytes
-rw-r--r--skins/larry/images/roundcube_logo.pngbin7216 -> 3792 bytes
-rw-r--r--skins/larry/thumbnail.pngbin3838 -> 2100 bytes
26 files changed, 36 insertions, 10 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 41528aa19..d3c9aba90 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,9 +5,7 @@ CHANGELOG Roundcube Webmail
- Support contacts import in GMail CSV format
- Added namespace filter in Folder Manager
- Added folder searching in Folder Manager
-- Fix insert-signature command in external compose window if opened from inline compose screen (#1490074)
- Fix restoring draft messages from localStorage if editor mode differs (#1490016)
-- Added 'sig_max_lines' config option to default config file (#1490071)
- Added config option/user preference to disable saving messages in localStorage (#1489979)
- Added config option 'imap_log_session' to enable Roundcube <-> IMAP session ID logging
- Added config option 'log_session_id' to control the lengh of the session identifer in logs
@@ -21,9 +19,7 @@ CHANGELOG Roundcube Webmail
- Support images in HTML signatures (#1488676)
- Display full quota information in popup (#1485769, #1486604)
- Mail compose: Selecting contact inserts recipient to previously focused input - to/cc/bcc accordingly (#1489684)
-- Add option to set default message list mode - default_list_mode (#1487312)
- Close "no subject" prompt with Enter key (#1489580)
-- Add config option to specify IMAP connection socket parameters - imap_conn_options (#1489948)
- Password: Add option to force new users to change their password (#1486884)
- Improve support for screen readers and assistive technology using WCAG 2.0 and WAI ARIA standards
- Enable basic keyboard navigation throughout the UI (#1487845)
@@ -53,6 +49,17 @@ CHANGELOG Roundcube Webmail
- Don't remove links when html signature is converted to text (#1489621)
- Fix page title when using search filter (#1490023)
- Fix mbox files import
+- Fix setting flags on servers with no PERMANENTFLAGS response (#1490087)
+- Fix regression in SHAA password generation in ldap driver of password plugin (#1490094)
+
+RELEASE 1.0.3
+-------------
+- Initialize HTML editor before restoring a message from localStorage (#1490016)
+- Add 'sig_max_lines' config option to default config file (#1490071)
+- Add config option to specify IMAP connection socket parameters - imap_conn_options (#1489948)
+- Add option to set default message list mode - default_list_mode (#1487312)
+- Enable contextmenu plugin for TinyMCE editor (#1487014)
+- Fix insert-signature command in external compose window if opened from inline compose screen (#1490074)
- Fix some mime-type to extension mapping checks in Installer (#1489983)
- Fix errors when using localStorage in Safari's private browsing mode (#1489996)
- Fix bug where $Forwarded flag was being set even if server didn't support it (#1490000)
diff --git a/plugins/help/skins/larry/help.png b/plugins/help/skins/larry/help.png
index fe88ed4c9..e815e5444 100644
--- a/plugins/help/skins/larry/help.png
+++ b/plugins/help/skins/larry/help.png
Binary files differ
diff --git a/plugins/jqueryui/themes/larry/images/animated-overlay.gif b/plugins/jqueryui/themes/larry/images/animated-overlay.gif
index d441f75eb..d441f75eb 100755..100644
--- a/plugins/jqueryui/themes/larry/images/animated-overlay.gif
+++ b/plugins/jqueryui/themes/larry/images/animated-overlay.gif
Binary files differ
diff --git a/plugins/jqueryui/themes/larry/images/ui-dialog-close.png b/plugins/jqueryui/themes/larry/images/ui-dialog-close.png
index 3fc403f52..bc2e244ac 100644
--- a/plugins/jqueryui/themes/larry/images/ui-dialog-close.png
+++ b/plugins/jqueryui/themes/larry/images/ui-dialog-close.png
Binary files differ
diff --git a/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png b/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png
index 144ecfe77..77ebd0c5c 100644
--- a/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png
+++ b/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png
Binary files differ
diff --git a/plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.png b/plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.png
index 083a564f0..31a4ccacf 100755..100644
--- a/plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.png
+++ b/plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.png
Binary files differ
diff --git a/plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.png b/plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.png
index fdc2c494f..0ad2dc38d 100755..100644
--- a/plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.png
+++ b/plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.png
Binary files differ
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index 8340b179d..4d60833be 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -736,6 +736,9 @@ function smart_field_init(field)
if (field.attr('disabled'))
area.hide();
+ // disable the original field anyway, we don't want it in POST
+ else
+ field.prop('disabled', true);
field.after(area);
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index acd968723..340dd29f8 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -277,7 +277,7 @@ class rcube_ldap_password
if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
$salt = mhash_keygen_s2k(MHASH_SHA1, $password_clear, $salt, 4);
- $password = mhash(MHASH_MD5, $password_clear . $salt);
+ $password = mhash(MHASH_SHA1, $password_clear . $salt);
}
else if (function_exists('sha1')) {
$salt = substr(pack("H*", sha1($salt . $password_clear)), 0, 4);
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 0db57afc6..9239cd0b0 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -306,10 +306,10 @@ class password extends rcube_plugin
switch ($result) {
case PASSWORD_SUCCESS:
return;
- case PASSWORD_CRYPT_ERROR;
+ case PASSWORD_CRYPT_ERROR:
$reason = $this->gettext('crypterror');
break;
- case PASSWORD_CONNECT_ERROR;
+ case PASSWORD_CONNECT_ERROR:
$reason = $this->gettext('connecterror');
break;
case PASSWORD_ERROR:
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index e1a62767d..221b50afe 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1802,7 +1802,7 @@ class rcmail extends rcube
$error = 'errorreadonly';
}
else if ($res_code == rcube_storage::OVERQUOTA) {
- $error = 'errorroverquota';
+ $error = 'erroroverquota';
}
else if ($err_code && ($err_str = $this->storage->get_error_str())) {
// try to detect access rights problem and display appropriate message
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 9af5ce4c6..734a9311e 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -2041,8 +2041,14 @@ class rcube_imap_generic
$flag = $this->flags[strtoupper($flag)];
}
- if (!$flag || (!in_array($flag, (array) $this->data['PERMANENTFLAGS'])
- && !in_array('\\*', (array) $this->data['PERMANENTFLAGS']))
+ if (!$flag) {
+ return false;
+ }
+
+ // if PERMANENTFLAGS is not specified all flags are allowed
+ if (!empty($this->data['PERMANENTFLAGS'])
+ && !in_array($flag, (array) $this->data['PERMANENTFLAGS'])
+ && !in_array('\\*', (array) $this->data['PERMANENTFLAGS'])
) {
return false;
}
diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
index e0b8aea38..92a56363a 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -626,6 +626,16 @@ class rcube_plugin_api
}
/**
+ * Returns loaded plugin
+ *
+ * @return rcube_plugin Plugin instance
+ */
+ public function get_plugin($name)
+ {
+ return $this->plugins[$name];
+ }
+
+ /**
* Callback for template_container hooks
*
* @param array $attrib
diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
index 21298ab59..713ac169a 100644
--- a/skins/larry/images/buttons.png
+++ b/skins/larry/images/buttons.png
Binary files differ
diff --git a/skins/larry/images/contactgroup.png b/skins/larry/images/contactgroup.png
index 8303cf02f..6c5c736ec 100644
--- a/skins/larry/images/contactgroup.png
+++ b/skins/larry/images/contactgroup.png
Binary files differ
diff --git a/skins/larry/images/contactpic_32px.png b/skins/larry/images/contactpic_32px.png
index 358984ecc..d133233d0 100644
--- a/skins/larry/images/contactpic_32px.png
+++ b/skins/larry/images/contactpic_32px.png
Binary files differ
diff --git a/skins/larry/images/filedrop.png b/skins/larry/images/filedrop.png
index d4d455bdf..9c1aebeb9 100644
--- a/skins/larry/images/filedrop.png
+++ b/skins/larry/images/filedrop.png
Binary files differ
diff --git a/skins/larry/images/filetypes.png b/skins/larry/images/filetypes.png
index 09772660b..35c97d04e 100644
--- a/skins/larry/images/filetypes.png
+++ b/skins/larry/images/filetypes.png
Binary files differ
diff --git a/skins/larry/images/listicons.png b/skins/larry/images/listicons.png
index 6a5edfdb1..56e6fbc70 100644
--- a/skins/larry/images/listicons.png
+++ b/skins/larry/images/listicons.png
Binary files differ
diff --git a/skins/larry/images/login_shadow.png b/skins/larry/images/login_shadow.png
index 3edc46722..cd7e8bdc3 100644
--- a/skins/larry/images/login_shadow.png
+++ b/skins/larry/images/login_shadow.png
Binary files differ
diff --git a/skins/larry/images/messages.png b/skins/larry/images/messages.png
index ecfff1285..d5c8c6146 100644
--- a/skins/larry/images/messages.png
+++ b/skins/larry/images/messages.png
Binary files differ
diff --git a/skins/larry/images/messages_dark.png b/skins/larry/images/messages_dark.png
index d7c932502..e0bed1bb3 100644
--- a/skins/larry/images/messages_dark.png
+++ b/skins/larry/images/messages_dark.png
Binary files differ
diff --git a/skins/larry/images/overflowshadow.png b/skins/larry/images/overflowshadow.png
index 5728a2167..ceec94f2f 100644
--- a/skins/larry/images/overflowshadow.png
+++ b/skins/larry/images/overflowshadow.png
Binary files differ
diff --git a/skins/larry/images/quota.png b/skins/larry/images/quota.png
index 3ec26a739..61c1d414e 100644
--- a/skins/larry/images/quota.png
+++ b/skins/larry/images/quota.png
Binary files differ
diff --git a/skins/larry/images/roundcube_logo.png b/skins/larry/images/roundcube_logo.png
index 34b1b6384..d32dea672 100644
--- a/skins/larry/images/roundcube_logo.png
+++ b/skins/larry/images/roundcube_logo.png
Binary files differ
diff --git a/skins/larry/thumbnail.png b/skins/larry/thumbnail.png
index 1cd23ad3e..ab1fb0782 100644
--- a/skins/larry/thumbnail.png
+++ b/skins/larry/thumbnail.png
Binary files differ