From 2712e3200c69aa2ebcfe488d7941c3ad77c917bb Mon Sep 17 00:00:00 2001
From: "GDR\\!" <gdr@go2.pl>
Date: Thu, 24 May 2012 11:56:39 +0200
Subject: Password plugin made compatible with modern Virtualmin

Added a new username format in Virtualmin driver,
which works for default Virtualmin settings where
username is user.postfix and domain is taken from
email address.

Example:
email - info@goodcoffee.com
login - info.goodcof
---
 plugins/password/config.inc.php.dist    | 3 ++-
 plugins/password/drivers/virtualmin.php | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'plugins')

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);
         }
-- 
cgit v1.2.3


From c993e10d07d76ef7f24b45bc9e7c1c1115c85980 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 24 May 2012 18:18:47 +0200
Subject: Fixes for IE: better background for Hide/Show button, fixed invisible
 button in IE8

---
 plugins/hide_blockquote/hide_blockquote.js      | 2 +-
 plugins/hide_blockquote/skins/default/style.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

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%);
-- 
cgit v1.2.3