diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/hide_blockquote/hide_blockquote.js | 2 | ||||
| -rw-r--r-- | plugins/hide_blockquote/skins/default/style.css | 2 | ||||
| -rw-r--r-- | plugins/password/config.inc.php.dist | 3 | ||||
| -rw-r--r-- | plugins/password/drivers/virtualmin.php | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/plugins/hide_blockquote/hide_blockquote.js b/plugins/hide_blockquote/hide_blockquote.js index 9ab90af0d..20286ee14 100644 --- a/plugins/hide_blockquote/hide_blockquote.js +++ b/plugins/hide_blockquote/hide_blockquote.js @@ -24,7 +24,7 @@ function hide_blockquote() .css({'white-space': 'nowrap', overflow: 'hidden', position: 'relative'}) .text(res[0]); - link = $('<span class="blockquote-link">') + link = $('<span class="blockquote-link"></span>') .css({position: 'absolute', 'z-Index': 2}) .text(rcmail.gettext('hide_blockquote.show')) .data('parent', div) diff --git a/plugins/hide_blockquote/skins/default/style.css b/plugins/hide_blockquote/skins/default/style.css index 7b3c871c3..198172f92 100644 --- a/plugins/hide_blockquote/skins/default/style.css +++ b/plugins/hide_blockquote/skins/default/style.css @@ -17,7 +17,7 @@ span.blockquote-link { border-top: none; border-bottom-right-radius: 6px; border-bottom-left-radius: 6px; - background: #fff; + background: #f8f8f8; background: -moz-linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#e8e8e8)); background: -o-linear-gradient(top, #f8f8f8 0%, #e8e8e8 100%); diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist index aed0eaf28..37c79315d 100644 --- a/plugins/password/config.inc.php.dist +++ b/plugins/password/config.inc.php.dist @@ -308,7 +308,8 @@ $rcmail_config['hmailserver_server'] = array( // 5: domain-username // 6: username_domain // 7: domain_username -$rcmail_config['password_virtualmin_format'] = 0; +// 8: username@domain; mbox.username +$rcmail_config['password_virtualmin_format'] = 8; // pw_usermod Driver options diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php index b2547e07f..f6b9bd412 100644 --- a/plugins/password/drivers/virtualmin.php +++ b/plugins/password/drivers/virtualmin.php @@ -48,6 +48,10 @@ class rcube_virtualmin_password $pieces = explode("_", $username); $domain = $pieces[0]; break; + case 8: // domain taken from alias, username left as it was + $email = $rcmail->user->data['alias']; + $domain = substr(strrchr($email, "@"), 1); + break default: // username@domain $domain = substr(strrchr($username, "@"), 1); } |