diff --git a/CHANGELOG b/CHANGELOG
index ca034c1c0..bffffd612 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,16 @@
CHANGELOG Roundcube Webmail
===========================
+- Fixed selecting identity on reply/forward (#1487981)
+- Fix image type check for contact photo uploads
+
+RELEASE 0.6-beta
+----------------
+- Added unique connection identifier to IMAP debug messages
- Add option to hide selected LDAP addressbook on the list
- Add client-side checking of uploaded files size
- Add newlines between organization, department, jobtitle (#1488028)
- Recalculate date when replying to a message and localize the cite header (#1487675)
-- Fix XSS vulnerability in UI messages (#1488030)
- Fix handling of email addresses with quoted local part (#1487939)
- Fix EOL character in vCard exports (#1487873)
- Added optional "multithreading" autocomplete feature
diff --git a/plugins/acl/localization/de_DE.inc b/plugins/acl/localization/de_DE.inc
new file mode 100644
index 000000000..92c7e4290
--- /dev/null
+++ b/plugins/acl/localization/de_DE.inc
@@ -0,0 +1,83 @@
+
diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
index 296ee7cc2..fa074f09a 100644
--- a/plugins/http_authentication/http_authentication.php
+++ b/plugins/http_authentication/http_authentication.php
@@ -9,8 +9,7 @@
* // redirect the client to this URL after logout. This page is then responsible to clear HTTP auth
* $rcmail_config['logout_url'] = 'http://server.tld/logout.html';
*
- * see http://stackoverflow.com/questions/31326/is-there-a-browser-equivalent-to-ies-clearauthenticationcache
- * about how HTTP auth can be cleared
+ * See logout.html (in this directory) for an example how HTTP auth can be cleared.
*
* @version 1.4
* @author Thomas Bruederli
@@ -54,7 +53,7 @@ class http_authentication extends rcube_plugin
return $args;
}
-
+
function logout($args)
{
// redirect to configured URL in order to clear HTTP auth credentials
diff --git a/plugins/http_authentication/logout.html b/plugins/http_authentication/logout.html
new file mode 100644
index 000000000..0a78a62f2
--- /dev/null
+++ b/plugins/http_authentication/logout.html
@@ -0,0 +1,29 @@
+
+
+
+
+Logout
+
+
+
+
+
You've successully been logged out!
+
+
\ No newline at end of file
diff --git a/plugins/newmail_notifier/newmail_notifier.js b/plugins/newmail_notifier/newmail_notifier.js
index 6e1ae9fbb..6afd66aee 100644
--- a/plugins/newmail_notifier/newmail_notifier.js
+++ b/plugins/newmail_notifier/newmail_notifier.js
@@ -1,7 +1,7 @@
/**
* New Mail Notifier plugin script
*
- * @version 0.1
+ * @version 0.2
* @author Aleksander Machniak
*/
@@ -50,14 +50,16 @@ function newmail_notifier_basic()
// Sound notification
function newmail_notifier_sound()
{
+ var elem, src = 'plugins/newmail_notifier/sound.wav';
+
// HTML5
try {
- var elem = $('');
+ elem = $('');
elem.get(0).play();
}
// old method
catch (e) {
- var elem = $('');
+ elem = $('');
elem.appendTo($('body'));
window.setTimeout("$('#sound').remove()", 5000);
}
diff --git a/plugins/newmail_notifier/newmail_notifier.php b/plugins/newmail_notifier/newmail_notifier.php
index 679072c7a..a72d728dc 100644
--- a/plugins/newmail_notifier/newmail_notifier.php
+++ b/plugins/newmail_notifier/newmail_notifier.php
@@ -7,7 +7,7 @@
* 1. Basic - focus browser window and change favicon
* 2. Sound - play wav file
*
- * @version 0.1
+ * @version 0.2
* @author Aleksander Machniak
*
*
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index e3c987cd3..102845ed0 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -105,6 +105,7 @@ class rcube_imap_generic
private $prefs;
private $cmd_tag;
private $cmd_num = 0;
+ private $resourceid;
private $_debug = false;
private $_debug_handler = false;
@@ -734,8 +735,13 @@ class rcube_imap_generic
$line = trim(fgets($this->fp, 8192));
- if ($this->_debug && $line) {
- $this->debug('S: '. $line);
+ if ($this->_debug) {
+ // set connection identifier for debug output
+ preg_match('/#([0-9]+)/', (string)$this->fp, $m);
+ $this->resourceid = strtoupper(substr(md5($m[1].$this->user.microtime()), 0, 4));
+
+ if ($line)
+ $this->debug('S: '. $line);
}
// Connected to wrong port or connection error?
@@ -3361,6 +3367,10 @@ class rcube_imap_generic
*/
private function debug($message)
{
+ if ($this->resourceid) {
+ $message = sprintf('[%s] %s', $this->resourceid, $message);
+ }
+
if ($this->_debug_handler) {
call_user_func_array($this->_debug_handler, array(&$this, $message));
} else {
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index c363dc572..bf978a7ff 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -431,34 +431,41 @@ class rcube_ldap extends rcube_addressbook
// we have a search result resource
if ($this->ldap_result && $this->result->count > 0)
{
+ // sorting still on the ldap server
if ($this->sort_col && $this->prop['scope'] !== 'base' && !$this->vlv_active)
ldap_sort($this->conn, $this->ldap_result, $this->sort_col);
+ // start and end of the page
$start_row = $this->vlv_active ? 0 : $this->result->first;
$start_row = $subset < 0 ? $start_row + $this->page_size + $subset : $start_row;
$last_row = $this->result->first + $this->page_size;
$last_row = $subset != 0 ? $start_row + abs($subset) : $last_row;
+ // get all entries from the ldap server
$entries = ldap_get_entries($this->conn, $this->ldap_result);
- for ($i = $start_row; $i < min($entries['count'], $last_row); $i++)
- $this->result->add($this->_ldap2result($entries[$i]));
- }
- // temp hack for filtering group members
- if ($this->groups and $this->group_id)
- {
- $result = new rcube_result_set();
- while ($record = $this->result->iterate())
+ // filtering for group members
+ if ($this->groups and $this->group_id)
{
- if ($this->group_members[$record['ID']])
+ $count = 0;
+ $members = array();
+ foreach ($entries as $entry)
{
- $result->add($record);
- $result->count++;
+ if ($this->group_members[base64_encode($entry['dn'])])
+ {
+ $members[] = $entry;
+ $count++;
+ }
}
+ $entries = $members;
+ $entries['count'] = $count;
+ $this->result->count = $count;
}
- $this->result = $result;
- }
+ // filter entries for this page
+ for ($i = $start_row; $i < min($entries['count'], $last_row); $i++)
+ $this->result->add($this->_ldap2result($entries[$i]));
+ }
return $this->result;
}
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index f5c741fc5..c4dd73b23 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -434,7 +434,7 @@ class rcube_template extends rcube_html_page
if ($write) {
// add debug console
- if ($this->config['debug_level'] & 8) {
+ if ($realname != 'error' && ($this->config['debug_level'] & 8)) {
$this->add_footer('