diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/help/skins/larry/help.png | bin | 6099 -> 2876 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | plugins/jqueryui/themes/larry/images/animated-overlay.gif | bin | 1738 -> 1738 bytes | |||
| -rw-r--r-- | plugins/jqueryui/themes/larry/images/ui-dialog-close.png | bin | 1596 -> 644 bytes | |||
| -rw-r--r-- | plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png | bin | 437 -> 323 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.png | bin | 4369 -> 3395 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.png | bin | 4369 -> 3378 bytes | |||
| -rw-r--r-- | plugins/managesieve/managesieve.js | 3 | ||||
| -rw-r--r-- | plugins/password/drivers/ldap.php | 2 | ||||
| -rw-r--r-- | plugins/password/password.php | 4 |
9 files changed, 6 insertions, 3 deletions
diff --git a/plugins/help/skins/larry/help.png b/plugins/help/skins/larry/help.png Binary files differindex fe88ed4c9..e815e5444 100644 --- a/plugins/help/skins/larry/help.png +++ b/plugins/help/skins/larry/help.png diff --git a/plugins/jqueryui/themes/larry/images/animated-overlay.gif b/plugins/jqueryui/themes/larry/images/animated-overlay.gif Binary files differindex d441f75eb..d441f75eb 100755..100644 --- a/plugins/jqueryui/themes/larry/images/animated-overlay.gif +++ b/plugins/jqueryui/themes/larry/images/animated-overlay.gif diff --git a/plugins/jqueryui/themes/larry/images/ui-dialog-close.png b/plugins/jqueryui/themes/larry/images/ui-dialog-close.png Binary files differindex 3fc403f52..bc2e244ac 100644 --- a/plugins/jqueryui/themes/larry/images/ui-dialog-close.png +++ b/plugins/jqueryui/themes/larry/images/ui-dialog-close.png diff --git a/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png b/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png Binary files differindex 144ecfe77..77ebd0c5c 100644 --- a/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png +++ b/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png diff --git a/plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.png b/plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.png Binary files differindex 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 diff --git a/plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.png b/plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.png Binary files differindex 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 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: |
