summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/hide_blockquote/hide_blockquote.js2
-rw-r--r--plugins/hide_blockquote/skins/default/style.css2
-rw-r--r--plugins/password/config.inc.php.dist3
-rw-r--r--plugins/password/drivers/virtualmin.php4
-rw-r--r--program/include/rcmail.php5
-rw-r--r--program/include/rcube_imap_cache.php9
-rw-r--r--program/include/rcube_imap_generic.php3
-rw-r--r--program/include/rcube_session.php35
8 files changed, 37 insertions, 26 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);
}
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 20a0ff472..4dba0e1cf 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -2010,6 +2010,11 @@ class rcmail extends rcube
return $this->storage_connect();
}
+ public function imap_init()
+ {
+ return $this->storage_init();
+ }
+
/**
* Connect to the mail storage server with stored session data
*
diff --git a/program/include/rcube_imap_cache.php b/program/include/rcube_imap_cache.php
index 6db295ef3..eb2df165f 100644
--- a/program/include/rcube_imap_cache.php
+++ b/program/include/rcube_imap_cache.php
@@ -311,10 +311,10 @@ class rcube_imap_cache
$uid = intval($sql_arr['uid']);
$result[$uid] = $this->build_message($sql_arr);
- // save memory, we don't need message body here (?)
- $result[$uid]->body = null;
-
if (!empty($result[$uid])) {
+ // save memory, we don't need message body here (?)
+ $result[$uid]->body = null;
+
unset($msgs[$uid]);
}
}
@@ -1146,3 +1146,6 @@ class rcube_imap_cache
return $index;
}
}
+
+// for backward compat.
+class rcube_mail_header extends rcube_message_header { }
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 4a71cd9bb..959dd9fd0 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -26,9 +26,6 @@
+-----------------------------------------------------------------------+
*/
-// for backward compat.
-class rcube_mail_header extends rcube_message_header { }
-
/**
* PHP based wrapper class to connect to an IMAP server
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index 5a6a679d0..09a07d644 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -37,7 +37,7 @@ class rcube_session
private $unsets = array();
private $gc_handlers = array();
private $cookiename = 'roundcube_sessauth';
- private $vars = false;
+ private $vars;
private $key;
private $now;
private $secret = '';
@@ -134,11 +134,10 @@ class rcube_session
$this->vars = base64_decode($sql_arr['vars']);
$this->key = $key;
- if (!empty($this->vars))
- return $this->vars;
+ return !empty($this->vars) ? (string) $this->vars : '';
}
- return false;
+ return null;
}
@@ -157,7 +156,7 @@ class rcube_session
// no session row in DB (db_read() returns false)
if (!$this->key) {
- $oldvars = false;
+ $oldvars = null;
}
// use internal data from read() for fast requests (up to 0.5 sec.)
else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5)) {
@@ -167,7 +166,7 @@ class rcube_session
$oldvars = $this->db_read($key);
}
- if ($oldvars !== false) {
+ if ($oldvars !== null) {
$newvars = $this->_fixvars($vars, $oldvars);
if ($newvars !== $oldvars) {
@@ -197,7 +196,7 @@ class rcube_session
*/
private function _fixvars($vars, $oldvars)
{
- if ($oldvars !== false) {
+ if ($oldvars !== null) {
$a_oldvars = $this->unserialize($oldvars);
if (is_array($a_oldvars)) {
foreach ((array)$this->unsets as $k)
@@ -265,13 +264,13 @@ class rcube_session
$this->vars = $arr['vars'];
$this->key = $key;
- if (!empty($this->vars))
- return $this->vars;
+ return !empty($this->vars) ? (string) $this->vars : '';
}
- return false;
+ return null;
}
+
/**
* Save session data.
* handler for session_read()
@@ -286,21 +285,22 @@ class rcube_session
// no session data in cache (mc_read() returns false)
if (!$this->key)
- $oldvars = false;
+ $oldvars = null;
// use internal data for fast requests (up to 0.5 sec.)
else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5))
$oldvars = $this->vars;
else // else read data again
$oldvars = $this->mc_read($key);
- $newvars = $oldvars !== false ? $this->_fixvars($vars, $oldvars) : $vars;
-
+ $newvars = $oldvars !== null ? $this->_fixvars($vars, $oldvars) : $vars;
+
if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 2)
return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)), MEMCACHE_COMPRESSED, $this->lifetime);
-
+
return true;
}
+
/**
* Handler for session_destroy() with memcache backend
*
@@ -350,7 +350,7 @@ class rcube_session
{
session_regenerate_id($destroy);
- $this->vars = false;
+ $this->vars = null;
$this->key = session_id();
return true;
@@ -373,13 +373,14 @@ class rcube_session
return true;
}
-
+
+
/**
* Kill this session
*/
public function kill()
{
- $this->vars = false;
+ $this->vars = null;
$this->ip = $_SERVER['REMOTE_ADDR']; // update IP (might have changed)
$this->destroy(session_id());
rcube_utils::setcookie($this->cookiename, '-del-', time() - 60);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-19 19:31:37 +0000