From 5e8de7f972102a772641c7b3d96a00e207c4e4f5 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 25 Jul 2014 07:53:30 +0000
Subject: [PATCH 01/94] Get the socialMedia icons out of table and append it to
 form if it is pixelegg template

---
 phpgwapi/js/login.js                         | 19 ++-----------------
 phpgwapi/templates/default/login.tpl         |  2 +-
 phpgwapi/templates/idots/css/traditional.css |  2 +-
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/phpgwapi/js/login.js b/phpgwapi/js/login.js
index 7d8cc4d366..0fff07bc79 100644
--- a/phpgwapi/js/login.js
+++ b/phpgwapi/js/login.js
@@ -14,12 +14,13 @@ egw_LAB.wait(function() {
 	}).done(function(_data)
 	{
 		$j(document).ready(function() {
+			var isPixelegg = $j('link[href*="pixelegg.css"]')[0];
 			var social = $j(document.createElement('div'))
 				.attr({
 					id: "socialMedia",
 					class: "socialMedia"
 				})
-				.appendTo($j('#socialBox'));
+				 .appendTo($j( isPixelegg? 'form' : '#socialBox'));
 
 			for(var i=0; i < _data.length; ++i)
 			{
@@ -36,19 +37,3 @@ egw_LAB.wait(function() {
 		});
 	});
 });
-
-//	$j('img.bgfade').hide();
-////                                var dg_H = $j(window).height();
-////                                var dg_W = $j(window).width();
-////    $j('#wrap').css({'height':dg_H,'width':dg_W});
-//
-//    function anim() {
-//    $j("#wrap img.bgfade").first().appendTo('#wrap').fadeOut(3500);
-//    $j("#wrap img").first().fadeIn(3500);
-//    setTimeout(anim, 7000);
-//    }
-//anim();
-//$j(window).resize(function(){window.location.href=window.location.href});
-//	});
-//
-//});
diff --git a/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl
index 038a446323..3b40c26d41 100644
--- a/phpgwapi/templates/default/login.tpl
+++ b/phpgwapi/templates/default/login.tpl
@@ -62,7 +62,7 @@
 				</tr>
 <!-- END registration -->
 				<tr>
-					<td id="socialBox"></td>
+					<td id="socialBox" colspan="3"></td>
 				</tr>
 			</table>
 		</form>
diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index 1abb9cdb15..2ffbf5fd87 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -471,8 +471,8 @@ body {
 	background-color: white;
 }
 #socialMedia {
-    left: 273px;
     position: relative;
+	float:right;
 }
 #loginScreenMessage {
 	text-align: center;

From 35e5ff6d6ef674389cc0bc9c0c8d625bc5271039 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 25 Jul 2014 09:13:19 +0000
Subject: [PATCH 02/94] * Admin: restore from admin was not working (worked
 only from setup)

---
 admin/inc/class.admin_db_backup.inc.php | 4 +++-
 phpgwapi/inc/class.db_backup.inc.php    | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin/inc/class.admin_db_backup.inc.php b/admin/inc/class.admin_db_backup.inc.php
index 47f13c71ff..c2e57f5f52 100644
--- a/admin/inc/class.admin_db_backup.inc.php
+++ b/admin/inc/class.admin_db_backup.inc.php
@@ -23,7 +23,7 @@ class admin_db_backup
 	{
 		$this->db_backup = new db_backup();
 
- 		if ($f = $this->db_backup->fopen_backup())
+ 		if (($f = $this->db_backup->fopen_backup()))
  		{
 			$this->db_backup->backup($f);
 			if(is_resource($f))
@@ -41,9 +41,11 @@ class admin_db_backup
 		$tpl_root = EGW_SERVER_ROOT.'/setup/templates/default';
 		$self = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'admin.admin_db_backup.index'));
 		translation::add_app('setup');
+		egw_framework::csp_script_src_attrs('unsafe-inline');
 
 		include EGW_SERVER_ROOT.'/setup/db_backup.php';
 
+		unset($tpl_root, $self);
 		common::egw_footer();
 	}
 }
diff --git a/phpgwapi/inc/class.db_backup.inc.php b/phpgwapi/inc/class.db_backup.inc.php
index 58a61d064a..e17bfdd8e6 100644
--- a/phpgwapi/inc/class.db_backup.inc.php
+++ b/phpgwapi/inc/class.db_backup.inc.php
@@ -149,7 +149,7 @@ class db_backup
 		}
 		else	// called from eGW
 		{
-			$this->schema_proc = CreateObject('phpgwapi.schema_proc');
+			$this->schema_proc = new schema_proc();
 			if (!($this->backup_dir = $GLOBALS['egw_info']['server']['backup_dir']))
 			{
 				$this->backup_dir = $GLOBALS['egw_info']['server']['files_dir'].'/db_backup';
@@ -437,7 +437,7 @@ class db_backup
 				@ini_set('mbstring.internal_encoding',$charset);
 
 				// check if we really need to convert the charset, as it's not perfect and can do some damage
-				if ($convert_to_system_charset && !strcasecmp($convert_to_system_charset,$charset))
+				if ($convert_to_system_charset && !strcasecmp($this->schema_proc->system_charset, $charset))
 				{
 					$convert_to_system_charset = false;	// no conversation necessary
 				}
@@ -567,8 +567,8 @@ class db_backup
 
 		if ($convert_to_system_charset)	// store the changed charset
 		{
-			$this->db->insert($GLOBALS['egw_setup']->config_table,array(
-				'config_value' => $GLOBALS['egw_setup']->system_charset,
+			$this->db->insert(config::TABLE, array(
+				'config_value' => $this->schema_proc->system_charset,
 			),array(
 				'config_app' => 'phpgwapi',
 				'config_name' => 'system_charset',

From 970331b97c746661bae1e7de8b5ea91388310648 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 25 Jul 2014 10:17:15 +0000
Subject: [PATCH 03/94] * Addressbook/all apps: dates change every time they
 get stored (temporary fix as conditions causing that are not clear)

---
 etemplate/js/et2_widget_date.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/etemplate/js/et2_widget_date.js b/etemplate/js/et2_widget_date.js
index 7373fde1d2..6c83d61c42 100644
--- a/etemplate/js/et2_widget_date.js
+++ b/etemplate/js/et2_widget_date.js
@@ -238,6 +238,10 @@ var et2_date = et2_inputWidget.extend(
 			this.date.setMonth(0);
 			this.date.setFullYear(1970);
 		}
+		else if (this._type == 'date')
+		{
+			this.date.setHours(12);
+		}
 		// Convert to timestamp - no seconds
 		this.date.setSeconds(0,0);
 		return Math.round(this.date.valueOf() / 1000);

From acfd576c75d5455ce7ce79699a0ccf354cc57f2c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 25 Jul 2014 10:47:39 +0000
Subject: [PATCH 04/94] fixed not translated update-notification

---
 phpgwapi/lang/egw_de.lang | 4 ++--
 phpgwapi/lang/egw_en.lang | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang
index 2ccc882ae6..1010586433 100644
--- a/phpgwapi/lang/egw_de.lang
+++ b/phpgwapi/lang/egw_de.lang
@@ -91,7 +91,7 @@ austria	common	de	ÖSTERREICH
 author	common	de	Autor
 autohide sidebox menu's	common	de	Linkes Navigationsmenü ausblenden
 autohide sidebox menus	common	de	Linkes Navigationsmenü ausblenden
-automatic update check failed, you need to check manually!	admin	de	Automatischer Test fehlgeschlagen, Sie müssen selbst überprüfen ob neue Updates vorliegen!
+automatic update check failed, you need to check manually!	common	de	Automatischer Test fehlgeschlagen, Sie müssen selbst überprüfen ob neue Updates vorliegen!
 automatically hide the sidebox menu's?	common	de	Automatisch linkes Navigationsmenü ausblenden?
 automatically hide the sidebox menus?	common	de	Automatisch linkes Navigationsmenü ausblenden?
 autosave default category	common	de	Standard-Kategorie automatisch speichern
@@ -267,7 +267,7 @@ edit categories	common	de	Kategorien editieren
 edit category	common	de	Kategorie editieren
 egroupware	common	de	EGroupware
 egroupware api version	common	de	EGroupware API Version
-egroupware maintenance update %1 available	admin	de	EGroupware Fehlerbehebungsupdate %1 ist verfügbar
+egroupware maintenance update %1 available	common	de	EGroupware Fehlerbehebungsupdate %1 ist verfügbar
 egroupware security update %1 needs to be installed!	common	de	EGroupware Sicherheitsupdate %1 muss installiert werden!
 egroupware: login blocked for user '%1', ip %2	common	de	EGroupware: Anmelden gesperrt für Benutzer '%1', IP %2
 egypt	common	de	ÄGYPTEN
diff --git a/phpgwapi/lang/egw_en.lang b/phpgwapi/lang/egw_en.lang
index 748c167c30..3a9d29775c 100644
--- a/phpgwapi/lang/egw_en.lang
+++ b/phpgwapi/lang/egw_en.lang
@@ -91,7 +91,7 @@ austria	common	en	AUSTRIA
 author	common	en	Author
 autohide sidebox menu's	common	en	Autohide side menu
 autohide sidebox menus	common	en	Autohide side menu
-automatic update check failed, you need to check manually!	admin	en	Automatic update check failed, you need to check manually!
+automatic update check failed, you need to check manually!	common	en	Automatic update check failed, you need to check manually!
 automatically hide the sidebox menu's?	common	en	Automatically hide the side menu?
 automatically hide the sidebox menus?	common	en	Automatically hide the side menu?
 autosave default category	common	en	Auto-save default category.
@@ -267,7 +267,7 @@ edit categories	common	en	Edit categories
 edit category	common	en	Edit category
 egroupware	common	en	EGroupware
 egroupware api version	common	en	EGroupware API version
-egroupware maintenance update %1 available	admin	en	EGroupware maintenance update %1 available
+egroupware maintenance update %1 available	common	en	EGroupware maintenance update %1 available
 egroupware security update %1 needs to be installed!	common	en	EGroupware security update %1 needs to be installed!
 egroupware: login blocked for user '%1', ip %2	common	en	Login blocked for user '%1', IP %2
 egypt	common	en	EGYPT

From 6744ba967e1387e4e21ae6643c59566feaddff37 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 25 Jul 2014 12:22:57 +0000
Subject: [PATCH 05/94] force CKEditor moono theme/skin on 14.1 update

---
 phpgwapi/setup/tables_update_1_8.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpgwapi/setup/tables_update_1_8.inc.php b/phpgwapi/setup/tables_update_1_8.inc.php
index 83a8208d24..41644a85d7 100644
--- a/phpgwapi/setup/tables_update_1_8.inc.php
+++ b/phpgwapi/setup/tables_update_1_8.inc.php
@@ -562,6 +562,7 @@ function phpgwapi_upgrade1_9_021()
 	{
 		preferences::change_preference('common', 'template_set', 'pixelegg', null, 'forced');
 		preferences::change_preference('common', 'theme', 'pixelegg', null, 'forced');
+		preferences::change_preference('common', 'rte_skin', 'moono', null, 'forced');
 	}
 	preferences::change_preference('common', 'maxmatchs', '20', null, 'forced');
 

From c6783d8b8e7be49c2fcbe65eee74636f6eb43cd8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 25 Jul 2014 12:32:34 +0000
Subject: [PATCH 06/94] document hack, to work around birthdays changing one
 day for each time they are stored

---
 etemplate/js/et2_widget_date.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etemplate/js/et2_widget_date.js b/etemplate/js/et2_widget_date.js
index 6c83d61c42..868de776f0 100644
--- a/etemplate/js/et2_widget_date.js
+++ b/etemplate/js/et2_widget_date.js
@@ -238,6 +238,8 @@ var et2_date = et2_inputWidget.extend(
 			this.date.setMonth(0);
 			this.date.setFullYear(1970);
 		}
+		// this is a hack, to work around birthdays changing one day for each time they are stored
+		// ToDo: either find and fix the reason, or send date as YYYY-mm-dd string to server
 		else if (this._type == 'date')
 		{
 			this.date.setHours(12);

From 69076614024574bd95d88deb10dcd77f97e9f966 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 25 Jul 2014 14:14:45 +0000
Subject: [PATCH 07/94] copying 14.1 changelog to trunk, to stop update
 notification

---
 doc/rpm-build/debian.changes | 46 ++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/doc/rpm-build/debian.changes b/doc/rpm-build/debian.changes
index 7e8fe5e851..2878e5c2ec 100644
--- a/doc/rpm-build/debian.changes
+++ b/doc/rpm-build/debian.changes
@@ -1,3 +1,49 @@
+egroupware-epl (14.1.20140725-1) hardy; urgency=low
+
+  * Admin: restore backups from admin was not working (worked only from setup)
+  * Addressbook/all apps: dates change every time they get stored (temporary fix as conditions causing that are not clear)
+
+ -- Ralf Becker <rb@stylite.de>  Fri, 25 Jul 2014 12:18:25 +0200
+
+egroupware-epl (14.1.20140724-1) hardy; urgency=low
+
+  * Admin: automatic update check displaying an icon for available (security-)updates for admins, escalating for security updates to all users after 3 days
+  * EMailAdmin: if wizzard was called on error, it was not able to save fixed account (showed same error again)
+  * API/Admin: fixed not working Admin >> Clear cache for default APC(u) and files backends
+  * Admin/API: remove no longer fully supported method to not "store session-id in cookie", it is the safer default anyway
+  * Mail: fixed wrong folders displayed, if Cyrus administration was activated
+  * eTemplate2: fixed popups eg. tracker open empty, not rendering popup content
+  * Admin/LDAP: deactivated accounts could not be reactivated, as account popup was not showing selected account
+  * API/CKEditor: update to version 4.4.3 adding additional skins/themes
+  * Admin/Setup: restore of 14.1 backup was not working (backup file itself is correct)
+
+ -- Ralf Becker <rb@stylite.de>  Wed, 23 Jul 2014 18:50:31 +0200
+
+egroupware-epl (14.1.20140714-1) hardy; urgency=low
+
+  * Backup: backup could contain rows multiple times (which caused restore to fail)
+  * API: fixed broken configuration, causing eg. ActiveDirectory or LDAP authentication to fail (you need to run Setup >> Clear cache!)
+  * Preferences: non-admins were allowed to changed default, forced or group preferences
+  * Preferences: do NOT use deny configuration for admins
+  * SiteMgr: fixed sliteshow (was loaded before jQuery)
+  * Mail: unlock tree again after copy/move actions
+  * ProjectManager: fix broken duration units causing times to display as undefined
+  * eTemplate2: several fixes in widgets
+
+ -- Ralf Becker <rb@stylite.de>  Mon, 14 Jul 2014 18:40:34 +0200
+
+egroupware-epl (14.1.20140710-1) hardy; urgency=low
+
+  * final 14.1 release
+  * Admin/all apps: fix refresh of admin after calling site configuration, categories, etc from apps
+  * Admin: custom-fields were not loaded, account was edited from admin not addressbook
+  * EMailAdmin: fixed migration of Sieve to use SSL/TLS for port 5190 and StartTLS for all other ports
+  * EMailAdmin: fixed mail accounts valid for groups or multiple users and switching regular accounts to or from that
+  * Addressbook: fixed sorting of category tree
+  * Added context menu to download all linked files in one zip file
+
+ -- Ralf Becker <rb@stylite.de>  Wed, 09 Jul 2014 20:50:54 +0200
+
 egroupware-epl (14.1.20140708-1) hardy; urgency=low
 
   * Debian: aptitude install egroupware-epl now removes 1.8 community packages or updates all EPL 11.1 packages

From 40aa20eaa2100bec6dac7534ec88f4d527c668e2 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 28 Jul 2014 15:29:49 +0000
Subject: [PATCH 08/94] As we replace spaces with + for those account ids which
 contain spaces, therefore we need to do the same for getting request-id too.

---
 etemplate/inc/class.etemplate_request_cache.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etemplate/inc/class.etemplate_request_cache.inc.php b/etemplate/inc/class.etemplate_request_cache.inc.php
index 82e650561f..10f57c2378 100644
--- a/etemplate/inc/class.etemplate_request_cache.inc.php
+++ b/etemplate/inc/class.etemplate_request_cache.inc.php
@@ -114,7 +114,9 @@ class etemplate_request_cache extends etemplate_request
 	 */
 	static function request_id()
 	{
-		return uniqid($GLOBALS['egw_info']['flags']['currentapp'].'_'.$GLOBALS['egw_info']['user']['account_lid'].'_',true);
+		// As we replace spaces with + for those account ids which contain spaces, therefore we need to do the same for getting request id too.
+		$userID = str_replace(' ', '+', rawurldecode($GLOBALS['egw_info']['user']['account_lid']));
+		return uniqid($GLOBALS['egw_info']['flags']['currentapp'].'_'.$userID.'_',true);
 	}
 
 	/**

From 9851a8a6eff794ebf891d285dd6f03f17e08c225 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jul 2014 20:51:49 +0000
Subject: [PATCH 09/94] Trigger a clear event on the etemplate DOMContainer
 when the etemplate is cleared, so app code can listen for it. This allows a
 'et2_unload' sort of processing.

---
 etemplate/js/etemplate2.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index ada8af36fc..2c8268c4c3 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -121,6 +121,8 @@ etemplate2.prototype.resize = function()
  */
 etemplate2.prototype.clear = function()
 {
+	$j(this.DOMContainer).trigger('clear');
+	
 	// Remove any handlers on window (resize)
 	if(this.uniqueId)
 	{

From 8a70df4df8bd8debba6c1485cbb3900e42895816 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jul 2014 21:00:39 +0000
Subject: [PATCH 10/94] Handle num_rows set by application: - Don't overwrite
 num_rows setting if the application sets it for some reason - If num_rows is
 0, don't get the initial rows server side - If num_rows is 0 and the initial
 rows are missing, trigger an update right away to get them asyncronously.

---
 .../inc/class.etemplate_widget_nextmatch.inc.php      | 11 +++++++++--
 etemplate/js/et2_extension_nextmatch.js               |  9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index b217ab1a3d..316ab7007a 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -113,7 +113,11 @@ class etemplate_widget_nextmatch extends etemplate_widget
 		$value = self::get_array(self::$request->content, $form_name, true);
 
 		$value['start'] = 0;
-		$value['num_rows'] = self::INITIAL_ROWS;
+		if(!array_key_exists('num_rows',$value))
+		{
+			$value['num_rows'] = self::INITIAL_ROWS;
+		}
+
 		$value['rows'] = array();
 
 		$send_value = $value;
@@ -159,7 +163,10 @@ class etemplate_widget_nextmatch extends etemplate_widget
 			$send_value['order'] = $send_value['sort']['id'];
 			$send_value['sort'] = $send_value['sort']['asc'] ? 'ASC' : 'DESC';
 		}
-		$total = self::call_get_rows($send_value, $send_value['rows'], self::$request->readonlys);
+		if($value['num_rows'] != 0)
+		{
+			$total = self::call_get_rows($send_value, $send_value['rows'], self::$request->readonlys);
+		}
 		$value =& self::get_array(self::$request->content, $form_name, true);
 
 		// Add favorite here so app doesn't save it in the session
diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index c4e2daac5c..4c165b30b0 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -1082,7 +1082,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
 		this.dataview.grid.setTotalCount(total);
 
 		// Insert any data sent from server, so invalidate finds data already
-		if(this.options.settings.rows)
+		if(this.options.settings.rows && this.options.settings.num_rows)
 		{
 			this.controller.loadInitialData(
 				this.options.settings.dataStorePrefix,
@@ -1510,6 +1510,13 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
 			// Set filters to current values
 			this.controller.setFilters(this.activeFilters);
 
+			// If no data was sent from the server, and num_rows is 0, the nm will be empty.
+			// This triggers a cache check.
+			if(!(this.options.settings.rows && this.options.settings.num_rows))
+			{
+				this.controller.update();
+			}
+
 			// Load the default sort order
 			if (this.options.settings.order && this.options.settings.sort)
 			{

From df76846b378b812d42f64efedc2ea6e478374ebd Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jul 2014 21:17:06 +0000
Subject: [PATCH 11/94] Allow for long-term client side caching of dataFetch
 responses.

---
 phpgwapi/js/jsapi/egw_data.js | 152 +++++++++++++++++++++++++++++++++-
 1 file changed, 149 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/js/jsapi/egw_data.js b/phpgwapi/js/jsapi/egw_data.js
index 576875a095..0a2340290c 100644
--- a/phpgwapi/js/jsapi/egw_data.js
+++ b/phpgwapi/js/jsapi/egw_data.js
@@ -26,6 +26,15 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 
 	var lastModification = null;
 
+	/**
+	 * cacheCallback stores callbacks that determine if data is placed
+	 * into cacheStorage, or simply kept temporarily.  It is indexed
+	 * by prefix.
+	 *
+	 * @type Array
+	 */
+	var cacheCallback = {};
+
 	/**
 	 * The uid function generates a session-unique id for the current
 	 * application by appending the application name to the given uid.
@@ -40,6 +49,35 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 		return _prefix + "::" + _uid;
 	}
 
+	/**
+	 * Looks like too much data is cached.  Forget some.
+	 *
+	 * Tries to free up localStorage by removing cached data for the given
+	 * prefix, but if none is found it will remove all cached data.
+	 *
+	 * @param {string} _prefix UID / application prefix
+	 * @returns {Number} Number of cached recordsets removed
+	 */
+	function _clearCache(_prefix)
+	{
+		// Find cached items for the prefix, we prefer to expire just within the app
+		var indexes = [];
+		for(var i = 0; i < window.localStorage.length; i++)
+		{
+			if(window.localStorage.key(i).indexOf('cache_'+_prefix) == 0)
+			{
+				indexes.push(i);
+				window.localStorage.removeItem(window.localStorage.key(i));
+			}
+		}
+		// Nothing for that prefix?  Clear all cached data.
+		if(_prefix && indexes.length == 0)
+		{
+			return _clearCache('');
+		}
+		return indexes.length;
+	}
+
 	function parseServerResponse(_result, _callback, _context)
 	{
 		// Check whether the result is valid
@@ -61,9 +99,12 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 		if (_result.order && _result.data)
 		{
 			// Assemble the correct order uids
-			for (var i = 0; i < _result.order.length; i++)
+			if(!(_result.order.length && _result.order[0] && _result.order[0].indexOf(_context.prefix) == 0))
 			{
-				_result.order[i] = UID(_result.order[i], _context.prefix);
+				for (var i = 0; i < _result.order.length; i++)
+				{
+					_result.order[i] = UID(_result.order[i], _context.prefix);
+				}
 			}
 
 			// Load all data entries that have been sent or delete them
@@ -95,6 +136,37 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 				}
 			}
 
+			// Check to see if we need long-term caching of the query and its results
+			if(window.localStorage && _context.prefix && cacheCallback[_context.prefix])
+			{
+				// Ask registered callbacks if we should cache this
+				for(var i = 0; i < cacheCallback[_context.prefix].length; i++)
+				{
+					var cc = cacheCallback[_context.prefix][i];
+					var cache_key = false
+					if(cache_key = cc.callback.call(cc.context, _context))
+					{
+						cache_key = 'cache_' + _context.prefix + '::' + cache_key;
+						try
+						{
+							window.localStorage.setItem(cache_key,JSON.stringify(_result));
+						}
+						catch (e)
+						{
+							egw.debug('warning', 'Tried to cache some data', cache_key, e);
+
+							// Maybe ran out of space?  Free some up...
+							if(e.name == 'QuotaExceededError'	// storage quota is exceeded, remove cached data
+								|| 'NS_ERROR_DOM_QUOTA_REACHED')	// FF-name
+							{
+								var count = _clearCache(_context.prefix);
+								egw.debug('info', 'localStorage full, removed ' + count + ' stored datasets');
+							}
+						}
+					}
+				}
+			}
+
 			// Call the callback function and pass the calculated "order" array
 			// as well as the "total" count and the "timestamp" to the listener.
 			if (_callback)
@@ -204,6 +276,29 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 				knownUids.slice(typeof _queriedRange.start != "undefined" ? _queriedRange.start:0,KNOWN_UID_LIMIT);
 			}
 
+			// Check to see if we have long-term caching of the query and its results
+			if(window.localStorage && _context.prefix && cacheCallback[_context.prefix])
+			{
+				// Ask registered callbacks if we should cache this
+				for(var i = 0; i < cacheCallback[_context.prefix].length; i++)
+				{
+					var cc = cacheCallback[_context.prefix][i];
+					var cache_key = false
+					if(cache_key = cc.callback.call(cc.context, _context))
+					{
+						cache_key = 'cache_' + _context.prefix + '::' + cache_key;
+
+						var cached = window.localStorage.getItem(cache_key);
+						if(cached)
+						{
+							egw.debug('log', 'Data cached query: ' + cache_key + "\nprocessing...");
+							// Call right away with cached data.  We'll still ask the server
+							// though.
+							parseServerResponse(JSON.parse(cached), _callback, _context);
+						}
+					}
+				}
+			}
 			var request = egw.json(
 				_app+".etemplate_widget_nextmatch.ajax_get_rows.etemplate",
 				[
@@ -221,8 +316,59 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 				true
 			);
 			request.sendRequest();
-		}
+		},
 
+		/**
+		 * Turn on long-term client side cache of a particular request
+		 * (cache the nextmatch query results) for fast, immediate response
+		 * with old data.
+		 *
+		 * The request is still sent to the server, and the cache is updated
+		 * with fresh data, and any needed callbacks are called again with
+		 * the fresh data.
+		 *
+		 * @param {string} prefix UID / Application prefix should match the
+		 *	individual record prefix
+		 * @param {function} callback A function that will analize the provided fetch
+		 *	parameters and return a reproducable cache key, or false to not cache
+		 *	the request.
+		 * @param {object} context Context for callback function.
+		 */
+		dataCacheRegister: function(prefix, callback, context)
+		{
+			if(typeof cacheCallback[prefix] == 'undefined')
+			{
+				cacheCallback[prefix] = [];
+			}
+			cacheCallback[prefix].push({
+				callback: callback,
+				context: context
+			});
+		},
+
+		/**
+		 * Unregister a previously registered cache callback
+		 * @param {string} prefix UID / Application prefix should match the
+		 *	individual record prefix
+		 * @param {function} [callback] Callback function to un-register.  If
+		 *	omitted, all functions for the prefix will be removed.
+		 */
+		dataCacheUnregister: function(prefix, callback)
+		{
+			if(typeof callback != 'undefined')
+			{
+				for(var i = 0; i < cacheCallback[prefix].length; i++)
+				{
+					if(cacheCallback[prefix][i].callback == callback)
+					{
+						cacheCallback[prefix].splice(i,1);
+						return;
+					}
+				}
+			}
+			// Callback not provided or not found, reset by prefix
+			cacheCallback[prefix] = [];
+		}
 	};
 
 });

From 73c1f064b989a606ffd1257dfa971ef7aa3367f4 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jul 2014 21:21:23 +0000
Subject: [PATCH 12/94] Don't send mail rows when opening mail app, but use
 client side cache instead. Gives large speed improvements when changing to
 previously opened folders.

---
 mail/inc/class.mail_ui.inc.php |  2 ++
 mail/js/app.js                 | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 8d34dd236e..c5717fc10a 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -421,6 +421,8 @@ class mail_ui
 						);
 					}
 				}
+
+				$content[self::$nm_index]['num_rows'] = 0;      // Do not send any rows with initial request
 				$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,address,date,size';	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 				$content[self::$nm_index]['csv_fields'] = false;
 				if ($msg)
diff --git a/mail/js/app.js b/mail/js/app.js
index ea1d711f79..9e0a625df1 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -65,6 +65,11 @@ app.classes.mail = AppJS.extend(
 	 */
 	init: function() {
 		this._super.apply(this,arguments);
+
+		// Turn on client side, persistent cache
+		// egw.data system runs encapsulated below etemplate, so this must be
+		// done before the nextmatch is created.
+		this.egw.dataCacheRegister('mail',this.nm_cache, this);
 	},
 
 	/**
@@ -81,6 +86,10 @@ app.classes.mail = AppJS.extend(
 				$j(nm).off('refresh');
 			}
 		}
+		
+		// Unregister client side cache
+		this.egw.dataCacheUnregister('mail');
+
 		delete this.et2_obj;
 		// call parent
 		this._super.apply(this, arguments);
@@ -255,6 +264,32 @@ app.classes.mail = AppJS.extend(
 		}
 	},
 
+	/**
+	 * Callback function for dataFetch caching.
+	 *
+	 * We only cache the first chunk (50 rows), and only if search filter is not set,
+	 * but we cache this for every combination of folder, filter & filter2.
+	 *
+	 * @param {object} query_context Query information from egw.dataFetch()
+	 * @returns {string|false} Cache key, or false to not cache
+	 */
+	nm_cache: function(query_context)
+	{
+		// Only cache first chunk of rows, if no search filter
+		if((!query_context || !query_context.start) && query_context.count == 0 && !(
+			query_context.self._filters.search || false)
+		)
+		{
+			// Make sure keys match, even if some filters are not defined
+			return JSON.stringify({
+				selectedFolder: query_context.self._filters.selectedFolder || '',
+				filter: query_context.self._filters.filter || '',
+				filter2: query_context.self._filters.filter2
+			});
+		}
+		return false;
+	},
+
 	/**
 	 * mail rebuild Action menu On nm-list
 	 *

From 2fe7b340818576115bffedc15630026d554b9d8e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jul 2014 22:07:47 +0000
Subject: [PATCH 13/94] Smarter cache expiry based on age

---
 phpgwapi/js/jsapi/egw_data.js | 43 ++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/phpgwapi/js/jsapi/egw_data.js b/phpgwapi/js/jsapi/egw_data.js
index 0a2340290c..69c6ef0a71 100644
--- a/phpgwapi/js/jsapi/egw_data.js
+++ b/phpgwapi/js/jsapi/egw_data.js
@@ -52,11 +52,11 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 	/**
 	 * Looks like too much data is cached.  Forget some.
 	 *
-	 * Tries to free up localStorage by removing cached data for the given
-	 * prefix, but if none is found it will remove all cached data.
+	 * Tries to free up localStorage by removing the oldest cached data for the
+	 * given prefix, but if none is found it will look at all cached data.
 	 *
 	 * @param {string} _prefix UID / application prefix
-	 * @returns {Number} Number of cached recordsets removed
+	 * @returns {Number} Number of cached recordsets removed, normally 1.
 	 */
 	function _clearCache(_prefix)
 	{
@@ -66,8 +66,21 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 		{
 			if(window.localStorage.key(i).indexOf('cache_'+_prefix) == 0)
 			{
-				indexes.push(i);
-				window.localStorage.removeItem(window.localStorage.key(i));
+				var key = window.localStorage.key(i);
+				var cached = JSON.parse(window.localStorage.getItem(key));
+
+				if(cached.lastModification)
+				{
+					indexes.push({
+						key: key,
+						lastModification: cached.lastModification
+					});
+				}
+				else
+				{
+					// No way to know how old it is, just remove it
+					window.localStorage.removeItem(key);
+				}
 			}
 		}
 		// Nothing for that prefix?  Clear all cached data.
@@ -75,6 +88,17 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 		{
 			return _clearCache('');
 		}
+		// Found some cached for that prefix, only remove the oldest
+		else if (indexes.length > 0)
+		{
+			indexes.sort(function(a,b) {
+				if(a.lastModification < b.lastModification) return 1;
+				if(a.lastModification > b.lastModification) return -1;
+				return 0;
+			})
+			window.localStorage.removeItem(indexes.pop().key);
+			return 1;
+		}
 		return indexes.length;
 	}
 
@@ -153,15 +177,18 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 						}
 						catch (e)
 						{
-							egw.debug('warning', 'Tried to cache some data', cache_key, e);
-
-							// Maybe ran out of space?  Free some up...
+							// Maybe ran out of space?  Free some up.
 							if(e.name == 'QuotaExceededError'	// storage quota is exceeded, remove cached data
 								|| 'NS_ERROR_DOM_QUOTA_REACHED')	// FF-name
 							{
 								var count = _clearCache(_context.prefix);
 								egw.debug('info', 'localStorage full, removed ' + count + ' stored datasets');
 							}
+							// No, something worse happened
+							else
+							{
+								egw.debug('warning', 'Tried to cache some data.  It did not work.', cache_key, e);
+							}
 						}
 					}
 				}

From ffb986f560c3bef633b2e1c252086eaaf524cb40 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Jul 2014 23:11:22 +0000
Subject: [PATCH 14/94] Handle if ID is not a string instead of erroring.

---
 phpgwapi/js/jsapi/egw_data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/js/jsapi/egw_data.js b/phpgwapi/js/jsapi/egw_data.js
index 69c6ef0a71..3c3a15b770 100644
--- a/phpgwapi/js/jsapi/egw_data.js
+++ b/phpgwapi/js/jsapi/egw_data.js
@@ -123,7 +123,7 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 		if (_result.order && _result.data)
 		{
 			// Assemble the correct order uids
-			if(!(_result.order.length && _result.order[0] && _result.order[0].indexOf(_context.prefix) == 0))
+			if(!(_result.order.length && _result.order[0] && _result.order[0].indexOf && _result.order[0].indexOf(_context.prefix) == 0))
 			{
 				for (var i = 0; i < _result.order.length; i++)
 				{

From af749e891e9d59a3466fe45af55562484d58313a Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 29 Jul 2014 08:13:34 +0000
Subject: [PATCH 15/94] * Mail: handle broken filenames (non utf8) in
 attachments

---
 mail/inc/class.mail_ui.inc.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index c5717fc10a..376c90f240 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -2100,8 +2100,24 @@ class mail_ui
 
 			foreach ($attachments as $key => $value)
 			{
-				if (function_exists('mb_convert_variables')) mb_convert_variables("UTF-8","ISO-8559-1",$value['name']); # iso 2 UTF8
-				$attachmentHTML[$key]['filename']= ($value['name'] ? ( $filename ? $filename : $value['name'] ) : lang('(no subject)'));
+				$attachmentHTML[$key]['filename']= ($value['name'] ? ( $value['filename'] ? $value['filename'] : $value['name'] ) : lang('(no subject)'));
+				$test = @json_encode($attachmentHTML[$key]['filename']);
+				//error_log(__METHOD__.__LINE__.' ->'.strlen($singleBodyPart['body']).' Error:'.json_last_error().'<- BodyPart:#'.$test.'#');
+				if (($test=="null" || $test === false || is_null($test)) && strlen($attachmentHTML[$key]['filename'])>0)
+				{
+					// try to fix broken utf8
+					$x = utf8_encode($attachmentHTML[$key]['filename']);
+					$test = @json_encode($x);
+					if (($test=="null" || $test === false || is_null($test)) && strlen($attachmentHTML[$key]['filename'])>0)
+					{
+						// this should not be needed, unless something fails with charset detection/ wrong charset passed
+						$attachmentHTML[$key]['filename'] = (function_exists('mb_convert_encoding')?mb_convert_encoding($attachmentHTML[$key]['filename'],'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$attachmentHTML[$key]['filename']):$attachmentHTML[$key]['filename']));
+					}
+					else
+					{
+						$attachmentHTML[$key]['filename'] = $x;
+					}
+				}
 				$attachmentHTML[$key]['type']=$value['mimeType'];
 				$attachmentHTML[$key]['mimetype']=mime_magic::mime2label($value['mimeType']);
 				$attachmentHTML[$key]['size']=egw_vfs::hsize($value['size']);

From 235888ad886e4a76f0800927066789aba56b2545 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 29 Jul 2014 12:50:39 +0000
Subject: [PATCH 16/94] fix typo, that prevented the correct split of
 TreeNodeOpenItems

---
 etemplate/js/et2_widget_tree.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_tree.js b/etemplate/js/et2_widget_tree.js
index 75b4616fb5..4ed5148739 100644
--- a/etemplate/js/et2_widget_tree.js
+++ b/etemplate/js/et2_widget_tree.js
@@ -687,7 +687,7 @@ var et2_tree = et2_inputWidget.extend(
 	 */
 	getTreeNodeOpenItems: function (_nodeID, mode) {
 		if(this.input == null) return null;
-		var z = this.input.getSubItems(_nodeID).split(",");
+		var z = this.input.getSubItems(_nodeID).split(this.input.dlmtr);
 		var oS;
 		var PoS;
 		var rv;

From 81dc9a9be3de2bb13a41a9504f5e7577dc2e4a36 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 29 Jul 2014 15:02:46 +0000
Subject: [PATCH 17/94] Make sure all DOMSubtrees are loaded before trigger the
 print job on window onload. Fix error "getComputing is not function" when
 closing the window while the print preview is loaded

---
 infolog/js/app.js | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/infolog/js/app.js b/infolog/js/app.js
index af8ce4e6a8..8a82642c70 100644
--- a/infolog/js/app.js
+++ b/infolog/js/app.js
@@ -58,8 +58,7 @@ app.classes.infolog = AppJS.extend(
 				break;
 			case 'infolog.edit.print':
 				// Trigger print command if the infolog oppend for printing porpuse
-				var that = this;
-				jQuery('#infolog-edit-print').bind('load',function(){that.infolog_print_preview();});
+				this.infolog_print_preview_onload();
 		}
 	},
 
@@ -372,12 +371,36 @@ app.classes.infolog = AppJS.extend(
 		egw_open(id,'infolog','edit',{print:1});
 	},
 
+	/**
+	 * Trigger print() onload window
+	 */
+	infolog_print_preview_onload: function ()
+	{
+		var that = this;
+		jQuery('#infolog-edit-print').bind('load',function(){
+			var isLoadingCompleted = true;
+			jQuery('#infolog-edit-print').bind("DOMSubtreeModified",function(event){
+					isLoadingCompleted = false;
+					jQuery('#infolog-edit-print').unbind("DOMSubtreeModified");
+			});
+			setTimeout(function(){isLoadingCompleted = false},1000);
+			var interval = setInterval(function(){
+				if (!isLoadingCompleted)
+				{
+					clearInterval(interval);
+					that.infolog_print_preview();
+				}
+
+			}, 100);
+		});
+	},
+	
 	/**
 	 * Trigger print() function to print the current window
 	 */
-	infolog_print_preview: function ()
+	infolog_print_preview: function()
 	{
-		this.egw.message('Printing....');
+		this.egw.message('Printing...');
 		this.egw.window.print();
 	},
 

From cf9616fa0cb31512a4a1b7f2c0d04d63938b2b9c Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 29 Jul 2014 15:56:48 +0000
Subject: [PATCH 18/94] Avoid iframe, fixes favorites giving error after trying
 an invalid path

---
 filemanager/inc/class.filemanager_ui.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 751822797f..9b34d8be29 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -736,6 +736,7 @@ class filemanager_ui
 			egw::redirect_link('/index.php',array('menuaction'=>'filemanager.filemanager_ui.index',
 				'path' => self::get_home_dir(),
 				'msg' => lang('The requested path %1 is not available.',egw_vfs::decodePath($query['path'])),
+				'ajax' => 'true'
 			));
 		}
 		$rows = $dir_is_writable = array();

From 6689ca64f7587b3e7689605dce73fd3b6f89531a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 29 Jul 2014 17:39:35 +0000
Subject: [PATCH 19/94] SelectAccount with type "none" should get sel_options
 but it should be readonly if user has no admin access. Fix infolog delegation
 for admin users with selectAccount type "none" selected

---
 etemplate/inc/class.etemplate_widget_menupopup.inc.php | 4 +++-
 etemplate/js/et2_widget_selectAccount.js               | 1 -
 infolog/inc/class.infolog_ui.inc.php                   | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_menupopup.inc.php b/etemplate/inc/class.etemplate_widget_menupopup.inc.php
index 9587edf56d..e408e81b0f 100644
--- a/etemplate/inc/class.etemplate_widget_menupopup.inc.php
+++ b/etemplate/inc/class.etemplate_widget_menupopup.inc.php
@@ -199,8 +199,10 @@ class etemplate_widget_menupopup extends etemplate_widget
 		{
 			// Check selection preference, we may be able to skip reading some data
 			$select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
-			if($this->attrs['type'] == 'select-account' && !$GLOBALS['egw_info']['apps']['admin'] && $select_pref == 'none')
+			if($this->attrs['type'] == 'select-account' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $select_pref == 'none')
 			{
+				self::$request->preserv[$this->id] = self::$request->content[$this->id];
+				unset(self::$request->content[$this->id]);				
 				$this->attrs['readonly'] = true;
 			}
 
diff --git a/etemplate/js/et2_widget_selectAccount.js b/etemplate/js/et2_widget_selectAccount.js
index b4f2de90cd..e56f9c0a16 100644
--- a/etemplate/js/et2_widget_selectAccount.js
+++ b/etemplate/js/et2_widget_selectAccount.js
@@ -111,7 +111,6 @@ var et2_selectAccount = et2_selectbox.extend(
 		switch(type)
 		{
 			case 'none':
-				break;
 			case 'selectbox':
 			case 'groupmembers':
 			default:
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 9272307cc6..68952376c2 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -2060,8 +2060,6 @@ class infolog_ui
 		{
 			$readonlys['tabs']['project'] = true;	// disable the project tab
 		}
-		$readonlys['tabs']['delegation'] = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none' &&
-			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
 
 		$content['duration_format'] = $this->duration_format;
 		$content['hours_per_workday'] = $this->hours_per_workday;

From 795e2cdb9c7c404e78d437e844ff691fe330ff6b Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 29 Jul 2014 21:46:01 +0000
Subject: [PATCH 20/94] Refine cache check conditions, rows is always empty by
 this point.

---
 etemplate/js/et2_extension_nextmatch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 4c165b30b0..b66028f211 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -1512,7 +1512,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
 
 			// If no data was sent from the server, and num_rows is 0, the nm will be empty.
 			// This triggers a cache check.
-			if(!(this.options.settings.rows && this.options.settings.num_rows))
+			if(!this.options.settings.num_rows)
 			{
 				this.controller.update();
 			}

From 5b873215b0228083e5528b2b187b2ab5a0a8cf18 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 29 Jul 2014 21:51:37 +0000
Subject: [PATCH 21/94] - Fix expanding closed projects by passing parent ID -
 Fix missing milestone icon

---
 etemplate/js/et2_widget_gantt.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/etemplate/js/et2_widget_gantt.js b/etemplate/js/et2_widget_gantt.js
index 764ea0a8a7..0ec7abe235 100644
--- a/etemplate/js/et2_widget_gantt.js
+++ b/etemplate/js/et2_widget_gantt.js
@@ -229,6 +229,8 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 	set_value: function(value) {
 		if(this.gantt == null) return false;
 
+		this.gantt.clearAll();
+		
 		// Ensure proper format, no extras
 		var safe_value = {
 			data: value.data || [],
@@ -505,11 +507,12 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 		// Bind AJAX for dynamic expansion
 		// TODO: This could be improved
 		this.gantt.attachEvent("onTaskOpened", function(id, item) {
+			var task = this.getTask(id);
 			// Node children are already there & displayed
 			var value = gantt_widget.getInstanceManager().getValues(gantt_widget.getInstanceManager().widgetContainer);
 
 			var request = gantt_widget.egw().json(gantt_widget.options.autoload,
-				[id,value],
+				[id,value,task.parent||false],
 				function(data) {
 					this.parse(data);
 				},
@@ -732,7 +735,7 @@ et2_register_widget(et2_gantt, ["gantt"]);
 $j(function() {
 	// Set icon to match application
 	gantt.templates.grid_file = function(item) {
-		if(!item.pe_app || !egw.image(item.pe_icon)) return "<div class='gantt_tree_icon gantt_file'></div>";
+		if(!item.pe_icon || !egw.image(item.pe_icon)) return "<div class='gantt_tree_icon gantt_file'></div>";
 		return "<div class='gantt_tree_icon' style='background-image: url(\"" + egw.image(item.pe_icon) + "\");'/></div>";
 	}
 

From d21e2b2dd7678ad4d2fc0946b1212127aca9eb40 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 29 Jul 2014 22:10:48 +0000
Subject: [PATCH 22/94] Avoid error if _filters is not set

---
 mail/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 9e0a625df1..73f02b93e3 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -277,7 +277,7 @@ app.classes.mail = AppJS.extend(
 	{
 		// Only cache first chunk of rows, if no search filter
 		if((!query_context || !query_context.start) && query_context.count == 0 && !(
-			query_context.self._filters.search || false)
+			!query_context.self._filters || query_context.self._filters.search || false)
 		)
 		{
 			// Make sure keys match, even if some filters are not defined

From 5114fbe11a6e4d3351bd857aa2c72dd105d3d2d8 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 30 Jul 2014 14:17:38 +0000
Subject: [PATCH 23/94] Add timesheet ID to nm listview

---
 timesheet/templates/default/index.xet | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/timesheet/templates/default/index.xet b/timesheet/templates/default/index.xet
index f865f61232..9656a67858 100644
--- a/timesheet/templates/default/index.xet
+++ b/timesheet/templates/default/index.xet
@@ -28,6 +28,7 @@
 			</columns>
 			<rows>
 				<row class="th">
+					<nextmatch-sortheader label="ID" id="ts_id"/>
 					<nextmatch-sortheader label="Date" id="ts_start"/>
 					<grid spacing="0" padding="0">
 						<columns>
@@ -67,6 +68,7 @@
 					<nextmatch-customfields id="customfields"/>
 				</row>
 				<row class="$row_cont[cat_id] $row_cont[class]">
+					<description id="${row}[ts_id]"/>
 					<date-time id="${row}[ts_start]" readonly="true" options=",8"/>
 					<vbox>
 						<link id="${row}[ts_link]" no_lang="1"/>

From ef6aed6579d2d572ed3a5533ab36f405c51cda24 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 30 Jul 2014 15:12:05 +0000
Subject: [PATCH 24/94] Make sure we are getting the current appName

---
 etemplate/js/et2_widget_link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_link.js b/etemplate/js/et2_widget_link.js
index d3578098f4..1dd202cb83 100644
--- a/etemplate/js/et2_widget_link.js
+++ b/etemplate/js/et2_widget_link.js
@@ -912,7 +912,7 @@ var et2_link_entry = et2_inputWidget.extend(
 		// Remove specific display and revert to CSS file
 		// show() would use inline, should be inline-block
 		this.clear.css('display','');
-		this.request = egw.json(this.egw().getAppName() + ".etemplate_widget_link.ajax_link_search.etemplate",
+		this.request = egw.json(egw_getAppName() + ".etemplate_widget_link.ajax_link_search.etemplate",
 			[this.app_select.val(), '', request.term, request.options],
 			this._results,
 			this,true,this

From c1c90c262108a91f8a80e05272fff43fe12dae25 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 31 Jul 2014 10:10:07 +0000
Subject: [PATCH 25/94] cache subscribedFolders Call to be used in
 getfolderStatus; control param if to fetch subscribed Info on getFolderStatus
 at all; own getMailboxCounters wrapper, instead of getFolderStatus, if one
 needs the counters only

---
 mail/inc/class.mail_ui.inc.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 376c90f240..ab55f90448 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -875,8 +875,10 @@ class mail_ui
 				if ($levelCt>$cmblevelsCt+1) $fetchCounters=false;
 			}
 			//error_log(__METHOD__.__LINE__.' fc:'.$fetchCounters.'/'.$_fetchCounters.'('.$levelCt.'/'.$cmblevelsCt.')'.' for:'.array2string($key));
-			$fS = $this->mail_bo->getFolderStatus($key,false,($fetchCounters?false:true));
-			//error_log(__METHOD__.__LINE__.array2string($fS));
+			$fS = $this->mail_bo->getFolderStatus($key,false,($fetchCounters?false:true),false);
+			//error_log(__METHOD__.__LINE__.'Object:'.array2string($obj));
+			//error_log(__METHOD__.__LINE__.'Status:'.array2string($fS));
+			//error_log(__METHOD__.__LINE__."-------------------------");
 			$fFP = $folderParts = explode($obj->delimiter, $key);
 			if (in_array($key,$userDefinedFunctionFolders)) $obj->shortDisplayName = lang($obj->shortDisplayName);
 			//get rightmost folderpart
@@ -3323,7 +3325,7 @@ class mail_ui
 					if ($profileID != $this->mail_bo->profileID) continue; // only current connection
 					if ($folderName)
 					{
-						$fS = $this->mail_bo->getFolderStatus($folderName,false);
+						$fS = $this->mail_bo->getFolderStatus($folderName,false,false,false);
 						if (in_array($fS['shortDisplayName'],mail_bo::$autoFolders)) $fS['shortDisplayName']=lang($fS['shortDisplayName']);
 						//error_log(__METHOD__.__LINE__.array2string($fS));
 						if ($fS['unseen'])
@@ -3565,7 +3567,7 @@ class mail_ui
 		if (!empty($folderName))
 		{
 			$parentFolder=(!empty($folderName)?$folderName:'INBOX');
-			$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false);
+			$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false,false,false);
 			if ($folderInfo['unseen'])
 			{
 				$folderInfo['shortDisplayName'] = $folderInfo['shortDisplayName'].' ('.$folderInfo['unseen'].')';
@@ -3629,7 +3631,7 @@ class mail_ui
 					strpos($parentFolder,$folderName)===false)))) // indicates that we move the older up the tree within its own branch
 				{
 					//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
-					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false);
+					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false,false,false);
 					//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
 					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']),'\hasnochildren')=== false)
 					{
@@ -3674,7 +3676,7 @@ class mail_ui
 						$msg = $e->getMessage();
 					}
 					$this->mail_bo->reopen($parentFolder);
-					$this->mail_bo->getFolderStatus($parentFolder,false);
+					$this->mail_bo->getFolderStatus($parentFolder,false,false,false);
 					//error_log(__METHOD__.__LINE__.array2string($fS));
 					if ($hasChildren)
 					{
@@ -3706,8 +3708,8 @@ class mail_ui
 			{
 				translation::add_app('mail');
 
-				$oldFolderInfo = $this->mail_bo->getFolderStatus($oldParentFolder,false);
-				$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false);
+				$oldFolderInfo = $this->mail_bo->getFolderStatus($oldParentFolder,false,false,false);
+				$folderInfo = $this->mail_bo->getFolderStatus($parentFolder,false,false,false);
 				$refreshData = array(
 					$profileID.self::$delimiter.$oldParentFolder=>$oldFolderInfo['shortDisplayName'],
 					$profileID.self::$delimiter.$parentFolder=>$folderInfo['shortDisplayName']);
@@ -3756,7 +3758,7 @@ class mail_ui
 					//error_log(__METHOD__.__LINE__."$folderName,  implode($del,$pA), $_newName");
 					$oA = array();
 					$subFolders = array();
-					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false);
+					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false,false,false);
 					//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
 					if (!empty($oldFolderInfo['attributes']) && stripos(array2string($oldFolderInfo['attributes']),'\hasnochildren')=== false)
 					{
@@ -4015,7 +4017,7 @@ class mail_ui
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
 		{
-			$oldFolderInfo = $this->mail_bo->getFolderStatus($trashFolder,false);
+			$oldFolderInfo = $this->mail_bo->getFolderStatus($trashFolder,false,false,false);
 			$response = egw_json_response::get();
 			$response->call('egw.message',lang('empty trash'));
 			$response->call('app.mail.mail_reloadNode',array($icServerID.self::$delimiter.$trashFolder=>$oldFolderInfo['shortDisplayName']));

From 8ccef246b485b8fa866abbefba2d61a088869a9f Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 31 Jul 2014 10:18:41 +0000
Subject: [PATCH 26/94] Do not openConnection an extra time to imap server on
 constructor for changeProfile, refreshQuotaDisplay

---
 mail/inc/class.mail_ui.inc.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index ab55f90448..61b9820f13 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -126,7 +126,13 @@ class mail_ui
 			$this->mail_bo = mail_bo::getInstance(true,self::$icServerID);
 			if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 			//error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
-			if ($_GET['menuaction'] != 'mail.etemplate_widget_nextmatch.ajax_get_rows.etemplate')
+			
+			// RegEx to minimize extra openConnection
+			$needle = '/mail.etemplate_widget_nextmatch.ajax_get_rows.etemplate|'
+					. 'mail.mail_ui.ajax_refreshQuotaDisplay|'
+					. 'mail.mail_ui.ajax_changeProfile|'
+					. '^(?!mail)/';
+			if (!preg_match($needle,$_GET['menuaction']))
 			{
 				//error_log(__METHOD__.__LINE__.' Fetched IC Server openConnection:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 				//openConnection gathers SpecialUseFolderInformation and Delimiter Info

From 14711b891f3d1c685ee5ab907f6b824b3e767201 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 31 Jul 2014 10:42:56 +0000
Subject: [PATCH 27/94] fix call for mail.mail_ui.ajax_refreshQuotaDisplay; as
 the refresh of quota was not working after changing a profile after rev47954

---
 mail/inc/class.mail_ui.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 61b9820f13..cc41373b3a 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -3974,9 +3974,10 @@ class mail_ui
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
 			$this->changeProfile($icServerID);
 		}
-		if($this->mail_bo->connectionStatus !== false) {
+		try
+		{
 			$quota = $this->mail_bo->getQuotaRoot();
-		} else {
+		} catch (Exception $e) {
 			$quota['limit'] = 'NOT SET';
 		}
 

From 3358da94e58bfb51d5d3618253c492150497a4f5 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 31 Jul 2014 10:47:55 +0000
Subject: [PATCH 28/94] alter condion on not calling openConnection; as the
 refresh of quota was not working after changing a profile after rev47954 and
 not relyable after rev47956

---
 mail/inc/class.mail_ui.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index cc41373b3a..8b4cbcddfb 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -129,7 +129,7 @@ class mail_ui
 			
 			// RegEx to minimize extra openConnection
 			$needle = '/mail.etemplate_widget_nextmatch.ajax_get_rows.etemplate|'
-					. 'mail.mail_ui.ajax_refreshQuotaDisplay|'
+//					. 'mail.mail_ui.ajax_refreshQuotaDisplay|'
 					. 'mail.mail_ui.ajax_changeProfile|'
 					. '^(?!mail)/';
 			if (!preg_match($needle,$_GET['menuaction']))

From f6e5b613276930133f6719f791f08413ce719e2a Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 31 Jul 2014 11:47:49 +0000
Subject: [PATCH 29/94] pending translations from our translation server

---
 phpgwapi/lang/egw_de.lang | 3 ++-
 phpgwapi/lang/egw_en.lang | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang
index 1010586433..16392f5a6e 100644
--- a/phpgwapi/lang/egw_de.lang
+++ b/phpgwapi/lang/egw_de.lang
@@ -518,6 +518,7 @@ netherlands antilles	common	de	NIEDERLÄNDISCHE ANTILLEN
 never	common	de	Niemals
 new caledonia	common	de	NEU CALEDONIEN
 new entry added sucessfully	common	de	Neuer Eintrag wurde erfolgreich hinzugefügt
+new favorite	common	de	Erstellen Sie hier einen neuen Favorit
 new main category	common	de	neue Hauptkategorie
 new value	common	de	Neuer Wert
 new zealand	common	de	NEUSEELAND
@@ -832,7 +833,7 @@ unconnected nodes will be moved to %1.	admin	de	Nicht Verbundene Knoten werden n
 underline	common	de	Unterstrichen
 unicode	common	de	Unicode
 united arab emirates	common	de	VEREINIGTEN ARABISCHEN EMIRATE
-united kingdom	common	de	GROSSBRITANIEN
+united kingdom	common	de	GROSSBRITANNIEN
 united states	common	de	VEREINIGTE STAATEN VON AMERIKA
 united states minor outlying islands	common	de	UNITED STATES MINOR OUTLYING ISLANDS
 unknown	common	de	Unbekannt
diff --git a/phpgwapi/lang/egw_en.lang b/phpgwapi/lang/egw_en.lang
index 3a9d29775c..eba99f4f09 100644
--- a/phpgwapi/lang/egw_en.lang
+++ b/phpgwapi/lang/egw_en.lang
@@ -518,6 +518,7 @@ netherlands antilles	common	en	NETHERLANDS ANTILLES
 never	common	en	Never
 new caledonia	common	en	NEW CALEDONIA
 new entry added sucessfully	common	en	New entry added successfully.
+new favorite	common	en	New favorite
 new main category	common	en	New main category
 new value	common	en	New value
 new zealand	common	en	NEW ZEALAND

From 3f2eddc0c7e1e9b378b1cd4cbbc45c82fcee669a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 31 Jul 2014 17:43:33 +0000
Subject: [PATCH 30/94] Fix confilict ID in filemanager file dialog.
 Additionally, add "Cancel button to superuser authentication form"

---
 filemanager/templates/default/file.xet | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/filemanager/templates/default/file.xet b/filemanager/templates/default/file.xet
index 9b0cfe67e7..896f51f96c 100644
--- a/filemanager/templates/default/file.xet
+++ b/filemanager/templates/default/file.xet
@@ -276,7 +276,7 @@
 							<button label="Apply" id="button[apply]" image="apply" background_image="1"/>
 							<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
 						</hbox>
-						<buttononly align="right" statustext="Enter setup user and password to get root rights" label="Superuser" id="sudo" onclick="jQuery('.superuser').css('display','inline'); document.getElementById(form::name('sudo[user]')).focus();" image="superuser" background_image="1"/>
+						<buttononly align="right" statustext="Enter setup user and password to get root rights" label="Superuser" id="sudouser" onclick="jQuery('.superuser').css('display','inline'); document.getElementById(form::name('sudo[user]')).focus();" image="superuser" background_image="1"/>
 					</hbox>
 				</row>
 				<row>
@@ -298,7 +298,11 @@
 								</row>
 								<row>
 									<description/>
-									<button label="Submit" id="button[setup]"/>
+									<hbox>
+										<button label="Submit" id="button[setup]"/>
+										<buttononly label="Cancel" onclick="jQuery('.superuser').hide();"/>
+									</hbox>
+									
 								</row>
 							</rows>
 						</grid>

From 3021b6a3c9968443568bbf1f430c8b2263d8a820 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 31 Jul 2014 17:45:57 +0000
Subject: [PATCH 31/94] Handle logout onClick handler for superuser button in
 filemanager file dialog

---
 filemanager/inc/class.filemanager_ui.inc.php | 12 ++++++---
 filemanager/js/app.js                        | 27 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 9b34d8be29..faef24ed7f 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -1179,12 +1179,18 @@ class filemanager_ui
 		}
 		if (egw_vfs::$is_root)
 		{
-			$tpl->setElementAttribute('sudo', 'label', 'Logout');
-			$tpl->setElementAttribute('sudo', 'help','Log out as superuser');
+			$tpl->setElementAttribute('sudouser', 'label', 'Logout');
+			$tpl->setElementAttribute('sudouser', 'help','Log out as superuser');
 			// Need a more complex submit because button type is buttononly, which doesn't submit
-			$tpl->setElementAttribute('sudo', 'onclick','widget.getInstanceManager().submit(widget)');
+			$tpl->setElementAttribute('sudouser', 'onclick','app.filemanager.set_sudoButton(widget,"login")');
 
 		}
+		elseif ($button == 'sudo')
+		{
+			$tpl->setElementAttribute('sudouser', 'label', 'Superuser');
+			$tpl->setElementAttribute('sudouser', 'help','Enter setup user and password to get root rights');
+			$tpl->setElementAttribute('sudouser', 'onclick','app.filemanager.set_sudoButton(widget,"logout")');
+		}
 		if (($extra_tabs = egw_vfs::getExtraInfo($path,$content)))
 		{
 			// add to existing tabs in template
diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index 6cb20a894d..bbdfbf2bb4 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -773,5 +773,32 @@ app.classes.filemanager = AppJS.extend(
 		event.preventDefault();
 		event.stopPropagation();
 		return false;
+	},
+	
+	/**
+	 * Set Sudo button's label and change its onclick handler according to its action
+	 * 
+	 * @param {widget object} _widget sudo buttononly
+	 * @param {string} _action string of action type {login|logout}
+	 */
+	set_sudoButton: function (_widget, _action)
+	{
+		var widget = _widget || this.et2.getWidgetById('sudouser');
+		if (widget)
+		{
+			switch (_action)
+			{
+				case 'login':
+					widget.set_label('Logout');
+					this.et2._inst.submit(widget);
+					break;
+					
+				default:
+					widget.set_label('Superuser');
+					widget.onclick = function(){
+						jQuery('.superuser').css('display','inline');
+					}
+			}
+		}
 	}
 });

From a105ac7e1dbf14683e7690fa4ddb1cee17d80c8a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 1 Aug 2014 13:40:45 +0000
Subject: [PATCH 32/94] Append aliases to mail vacation addresses insted of
 replacing them with existing one

---
 mail/js/app.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 73f02b93e3..6411ecbd9a 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3018,12 +3018,23 @@ app.classes.mail = AppJS.extend(
 	sieve_vac_all_aliases: function()
 	{
 		var aliases = [];
+		var tmp = [];
 		var addr = this.et2.getWidgetById('addresses');
 		var addresses = this.et2.getArrayMgr('sel_options').data.addresses;
 
 		for(var id in addresses) aliases.push(id);
-
-		addr.set_value(aliases);
+		if (addr)
+		{
+			tmp = aliases.concat(addr.get_value());
+			
+			// returns de-duplicate items of an array
+			var deDuplicator = function (item,pos){
+									return tmp.indexOf(item) == pos	
+			};
+			
+			aliases = tmp.filter(deDuplicator);
+			addr.set_value(aliases);
+		}
 	},
 
 	/**

From eb350e2745a9dc33d61e10b9f429a1fc2ff1871c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 1 Aug 2014 13:58:47 +0000
Subject: [PATCH 33/94] pending translations from our translation server

---
 infolog/lang/egw_de.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infolog/lang/egw_de.lang b/infolog/lang/egw_de.lang
index 61fbd1c2a0..06e76e6a96 100644
--- a/infolog/lang/egw_de.lang
+++ b/infolog/lang/egw_de.lang
@@ -38,8 +38,8 @@ add a file	infolog	de	Datei anhängen
 add a new entry	infolog	de	einen neuen Eintrag anlegen
 add a new note	infolog	de	eine neue Notiz anlegen
 add a new phonecall	infolog	de	einen neuen Telefonanruf anlegen
-add a new sub-task, -note, -call to this entry	infolog	de	einen neuen Unterauftrag, -notiz, -anruf zu diesem Eintrag anlegen
-add a new todo	infolog	de	einen neuen Auftrag anlegen
+add a new sub-task, -note, -call to this entry	infolog	de	einen neuen Untereintrag erstellen.
+add a new todo	infolog	de	einen neuen Aufgage anlegen
 add file	infolog	de	Datei hinzufügen
 add or delete links	infolog	de	Verknüpfungen hinzufügen oder löschen
 add sub	infolog	de	neuen Untereintrag anlegen

From 9694a4c9f81c25eece44403a5d4b8e0a1e8a040b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 1 Aug 2014 14:46:36 +0000
Subject: [PATCH 34/94] Add email addresses of "all my aliases" in mail
 vacation, not account imap_username

---
 mail/inc/class.mail_sieve.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php
index 9606ec7470..3471906609 100644
--- a/mail/inc/class.mail_sieve.inc.php
+++ b/mail/inc/class.mail_sieve.inc.php
@@ -443,7 +443,7 @@ class mail_sieve
 		if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id'];
 
 		$accAllIdentities = $this->account->smtpServer()->getAccountEmailAddress(accounts::id2name($accountID));
-		$allAliases = array($this->account->acc_imap_username);
+		$allAliases = array($this->account->ident_email);
 		foreach ($accAllIdentities as &$arrVal)
 		{
 			if ($arrVal['type'] !='default')

From 7967387e3ac1cb13d4f1a2c79d322c45473d4e5e Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 4 Aug 2014 12:59:13 +0000
Subject: [PATCH 35/94] unlock tree immediately after fetching the rows

---
 mail/inc/class.mail_ui.inc.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 8b4cbcddfb..4d03714539 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1576,6 +1576,13 @@ class mail_ui
 			$sR=array();
 			self::callWizard($e->getMessage(), false);
 		}
+		// unlock immediately after fetching the rows
+		if (stripos($_GET['menuaction'],'ajax_get_rows')!==false)
+		{
+			//error_log(__METHOD__.__LINE__.' unlock tree ->'.$_GET['menuaction']);
+			$response = egw_json_response::get();
+			$response->call('app.mail.unlock_tree');
+		}
 		if (is_array($sR) && count($sR)>0)
 		{
 			foreach ((array)$sR as $key => $v)
@@ -1604,11 +1611,6 @@ class mail_ui
 		//error_log(__METHOD__.__LINE__.array2string($rows));
 
 		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'Folder:'.$_folderName.' Start:'.$query['start'].' NumRows:'.$query['num_rows'],__METHOD__.__LINE__);
-		if (stripos($_GET['menuaction'],'ajax_get_rows')!==false)
-		{
-			$response = egw_json_response::get();
-			$response->call('app.mail.unlock_tree');
-		}
 		return $rowsFetched['messages'];
 	}
 

From 22d6d80aaeb122029fc9429f02d1bc3fb9cb2260 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 4 Aug 2014 14:02:05 +0000
Subject: [PATCH 36/94] Add browser popup blocker checker for open_link method.
 -Fix not poping up the emailadminWizard popup when an IMAP error occurrs,
 because of the browser blocks the popup.

---
 mail/inc/class.mail_ui.inc.php          |   2 +-
 phpgwapi/js/jsapi/egw_open.js           |  41 ++++++-
 phpgwapi/js/webrtc/et2_widget_iframe.js | 146 ++++++++++++++++++++++++
 phpgwapi/lang/egw_de.lang               |   1 +
 4 files changed, 187 insertions(+), 3 deletions(-)
 create mode 100644 phpgwapi/js/webrtc/et2_widget_iframe.js

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 4d03714539..db11b4467a 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -169,7 +169,7 @@ class mail_ui
 		{
 			$response = egw_json_response::get();
 			$windowName = "editMailAccount".self::$icServerID;
-			$response->call("egw.open_link", egw::link('/index.php', $linkData), $windowName, "600x480");
+			$response->call("egw.open_link", egw::link('/index.php', $linkData), $windowName, "600x480",null,true);
 			egw_framework::message($message, 'error');
 			if ($_GET['menuaction'] == 'mail.mail_ui.index')
 			{
diff --git a/phpgwapi/js/jsapi/egw_open.js b/phpgwapi/js/jsapi/egw_open.js
index 337ef13d95..004adb0f31 100644
--- a/phpgwapi/js/jsapi/egw_open.js
+++ b/phpgwapi/js/jsapi/egw_open.js
@@ -238,8 +238,10 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) {
 		 * @param string _target optional target / window name
 		 * @param string _popup widthxheight, if a popup should be used
 		 * @param string _target_app app-name for opener
+		 * @param boolean _check_popup_blocker TRUE check if browser pop-up blocker is on/off, FALSE no check
+		 * - This option only makes sense to be enabled when the open_link requested without user interaction
 		 */
-		open_link: function(_link, _target, _popup, _target_app)
+		open_link: function(_link, _target, _popup, _target_app, _check_popup_blocker)
 		{
 			// Log for debugging purposes - don't use navigation here to avoid
 			// flooding log with details already captured by egw.open()
@@ -247,7 +249,11 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) {
 				"egw.open_link(_link=%s, _target=%s, _popup=%s, _target_app=%s)",
 				_link,_target,_popup,_target_app
 			);
-
+			//Check browser pop-up blocker
+			if (_check_popup_blocker)
+			{
+				if (this._check_popupBlocker(_link, _target, _popup, _target_app)) return;
+			}	
 			var url = _link;
 			if (url.indexOf('javascript:') == 0)
 			{
@@ -312,6 +318,37 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) {
 			{
 				_wnd.location.href = _url;
 			}
+		},
+		
+		/**
+		 * Check if browser pop-up blocker is on/off
+		 * 
+		 * @param string _link menuaction, EGroupware relative url or a full url (incl. "mailto:" or "javascript:")
+		 * @param string _target optional target / window name
+		 * @param string _popup widthxheight, if a popup should be used
+		 * @param string _target_app app-name for opener
+		 * 
+		 * @return boolean returns false if pop-up blocker is off
+		 * - returns true if pop-up blocker is on, 
+		 * - and re-call the open_link with provided parameters, after user interaction. 
+		 */
+		_check_popupBlocker: function(_link, _target, _popup, _target_app)
+		{
+			var popup = window.open("","",'top='+(screen.height/2)+',left='+(screen.width/2)+',width=1,height=1,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no,dependent=yes');
+
+			if (!popup||popup == 'undefined'||popup == null)
+			{
+				et2_dialog.show_dialog(function(){
+					window.egw.open_link(_link, _target, _popup, _target_app);
+				},egw.lang("The browser popup blocker is on. Please click on OK button to see the pop-up.\n\nIf you would like to not see this message for the next time, allow your browser pop-up blocker to open popups from %1",window.location.hostname) ,
+				"Popup Blocker Warning",{},et2_dialog.BUTTONS_OK,et2_dialog.WARNING_MESSAGE);
+				return true;
+			}
+			else
+			{
+				popup.close();
+				return false;
+			}
 		}
 	};
 });
diff --git a/phpgwapi/js/webrtc/et2_widget_iframe.js b/phpgwapi/js/webrtc/et2_widget_iframe.js
new file mode 100644
index 0000000000..c477b8ef1f
--- /dev/null
+++ b/phpgwapi/js/webrtc/et2_widget_iframe.js
@@ -0,0 +1,146 @@
+/**
+ * EGroupware eTemplate2 - JS widget class for an iframe
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @subpackage api
+ * @link http://www.egroupware.org
+ * @author Nathan Gray
+ * @copyright Nathan Gray 2013
+ * @version $Id$
+ */
+
+"use strict";
+
+/*egw:uses
+        et2_core_valueWidget;
+*/
+
+/**
+ * @augments et2_valueWidget
+ */
+var et2_iframe = et2_valueWidget.extend(
+{
+	attributes: {
+		'label': {
+			'default': "",
+			description: "The label is displayed by default in front (for radiobuttons behind) each widget (if not empty). If you want to specify a different position, use a '%s' in the label, which gets replaced by the widget itself. Eg. '%s Name' to have the label Name behind a checkbox. The label can contain variables, as descript for name. If the label starts with a '@' it is replaced by the value of the content-array at this index (with the '@'-removed and after expanding the variables).",
+			ignore: false,
+			name: "Label",
+			translate: true,
+			type: "string",
+		},
+		"needed": {
+			"ignore": true
+		},
+		"seamless": {
+			name: "Seamless",
+			'default': true,
+			description: "Specifies that the iframe should be rendered in a manner that makes it appear to be part of the containing document",
+			translate: false,
+			type: "boolean"
+		},
+		"name": {
+			name: "Name",
+			"default": "",
+			description: "Specifies name of frame, to be used as target for links",
+			type: "string"
+		}
+	},
+
+	/**
+	 * Constructor
+	 * 
+	 * @memberOf et2_iframe
+	 */
+	init: function() {
+		this._super.apply(this, arguments);
+
+		// Allow no child widgets
+		this.supportedWidgetClasses = [];
+
+		this.htmlNode = $j(document.createElement("iframe"));
+		if(this.options.label)
+		{
+			this.htmlNode.append('<span class="et2_label">'+this.options.label+'</span>');
+		}
+		this.setDOMNode(this.htmlNode[0]);
+	},
+
+	/**
+	 * Set name of iframe (to be used as target for links)
+	 * 
+	 * @param _name
+	 */
+	set_name: function(_name) {
+		this.htmlNode.attr('name', this.htmlNode.name = _name);
+	},
+
+	/**
+	 * Make it look like part of the containing document
+	 *
+	 * @param _seamless boolean
+	 */
+	set_seamless: function(_seamless) {
+		this.options.seamless = _seamless;
+		this.htmlNode.attr("seamless", _seamless);
+	},
+
+	set_value: function(_value) {
+		if(typeof _value == "undefined") _value = "";
+
+		if(_value.trim().indexOf("http") == 0 || _value.indexOf('about:') == 0 || _value[0] == '/')
+		{
+			// Value is a URL
+			this.set_src(_value);
+		}
+		else
+		{
+			// Value is content
+			this.set_srcdoc(_value);
+		}
+	},
+
+	/**
+	 * Set the URL for the iframe
+	 *
+	 * Sets the src attribute to the given value
+	 *
+	 * @param _value String URL
+	 */
+	set_src: function(_value) {
+		if(_value.trim() != "")
+		{
+			if(_value.trim() == 'about:blank')
+			{
+				this.htmlNode.attr("src", _value);
+			}
+			else
+			{
+				// Load the new page, but display a loader
+				var loader = $j('<div class="et2_iframe loading"/>');
+				this.htmlNode
+					.before(loader);
+				window.setTimeout(jQuery.proxy(function() {
+					this.htmlNode.attr("src", _value)
+						.one('load',function() {
+							loader.remove();
+						});
+				},this),0);
+
+			}
+		}
+	},
+
+	/**
+	 * Sets the content of the iframe
+	 *
+	 * Sets the srcdoc attribute to the given value
+	 *
+	 * @param _value String Content of a document
+	 */
+	set_srcdoc: function(_value) {
+		this.htmlNode.attr("srcdoc", _value);
+	}
+});
+et2_register_widget(et2_iframe, ["iframe"]);
diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang
index 16392f5a6e..385a3127cb 100644
--- a/phpgwapi/lang/egw_de.lang
+++ b/phpgwapi/lang/egw_de.lang
@@ -790,6 +790,7 @@ text color:	common	de	Textfarbe:
 thailand	common	de	THAILAND
 the api is current	common	de	Die API ist aktuell
 the api requires an upgrade	common	de	Die API benötigt eine Aktualisierung
+the browser popup blocker is on. please click on ok button to see the pop-up.\n\nif you would like to not see this message for the next time, allow your browser pop-up blocker to open popups from %1	common	de	Ihr Browser hat das Öffnen eines Popup-Dialogs blockiert. Bitte klicken Sie OK, um das Popup angezeigt zu bekommen.\n\nWenn Sie die Meldung nicht nochmals erhalten wollen, erlauben Sie bitte in den Einstellungen vom Browser für %1 das Öffnen von Popups.
 the following applications require upgrades	common	de	Die folgenden Anwendungen benötigen eine Aktualisierung
 the mail server returned	common	de	Der E-Mail-Server liefert zurück
 there already is a system-user with this name. user's should not have the same name as a systemuser	common	de	Es gibt schon einen System Benutzer mit dem selben Namen. Die Benutzer sollten nicht die gleichen Namen haben, wie die Systembenutzer.

From 671fec00d42aa873aa9fb2ae592884c4c05b3c22 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 4 Aug 2014 14:12:02 +0000
Subject: [PATCH 37/94] Delete accidentally added files by commit 47981

---
 phpgwapi/js/webrtc/et2_widget_iframe.js | 146 ------------------------
 1 file changed, 146 deletions(-)
 delete mode 100644 phpgwapi/js/webrtc/et2_widget_iframe.js

diff --git a/phpgwapi/js/webrtc/et2_widget_iframe.js b/phpgwapi/js/webrtc/et2_widget_iframe.js
deleted file mode 100644
index c477b8ef1f..0000000000
--- a/phpgwapi/js/webrtc/et2_widget_iframe.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * EGroupware eTemplate2 - JS widget class for an iframe
- *
- * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @package etemplate
- * @subpackage api
- * @link http://www.egroupware.org
- * @author Nathan Gray
- * @copyright Nathan Gray 2013
- * @version $Id$
- */
-
-"use strict";
-
-/*egw:uses
-        et2_core_valueWidget;
-*/
-
-/**
- * @augments et2_valueWidget
- */
-var et2_iframe = et2_valueWidget.extend(
-{
-	attributes: {
-		'label': {
-			'default': "",
-			description: "The label is displayed by default in front (for radiobuttons behind) each widget (if not empty). If you want to specify a different position, use a '%s' in the label, which gets replaced by the widget itself. Eg. '%s Name' to have the label Name behind a checkbox. The label can contain variables, as descript for name. If the label starts with a '@' it is replaced by the value of the content-array at this index (with the '@'-removed and after expanding the variables).",
-			ignore: false,
-			name: "Label",
-			translate: true,
-			type: "string",
-		},
-		"needed": {
-			"ignore": true
-		},
-		"seamless": {
-			name: "Seamless",
-			'default': true,
-			description: "Specifies that the iframe should be rendered in a manner that makes it appear to be part of the containing document",
-			translate: false,
-			type: "boolean"
-		},
-		"name": {
-			name: "Name",
-			"default": "",
-			description: "Specifies name of frame, to be used as target for links",
-			type: "string"
-		}
-	},
-
-	/**
-	 * Constructor
-	 * 
-	 * @memberOf et2_iframe
-	 */
-	init: function() {
-		this._super.apply(this, arguments);
-
-		// Allow no child widgets
-		this.supportedWidgetClasses = [];
-
-		this.htmlNode = $j(document.createElement("iframe"));
-		if(this.options.label)
-		{
-			this.htmlNode.append('<span class="et2_label">'+this.options.label+'</span>');
-		}
-		this.setDOMNode(this.htmlNode[0]);
-	},
-
-	/**
-	 * Set name of iframe (to be used as target for links)
-	 * 
-	 * @param _name
-	 */
-	set_name: function(_name) {
-		this.htmlNode.attr('name', this.htmlNode.name = _name);
-	},
-
-	/**
-	 * Make it look like part of the containing document
-	 *
-	 * @param _seamless boolean
-	 */
-	set_seamless: function(_seamless) {
-		this.options.seamless = _seamless;
-		this.htmlNode.attr("seamless", _seamless);
-	},
-
-	set_value: function(_value) {
-		if(typeof _value == "undefined") _value = "";
-
-		if(_value.trim().indexOf("http") == 0 || _value.indexOf('about:') == 0 || _value[0] == '/')
-		{
-			// Value is a URL
-			this.set_src(_value);
-		}
-		else
-		{
-			// Value is content
-			this.set_srcdoc(_value);
-		}
-	},
-
-	/**
-	 * Set the URL for the iframe
-	 *
-	 * Sets the src attribute to the given value
-	 *
-	 * @param _value String URL
-	 */
-	set_src: function(_value) {
-		if(_value.trim() != "")
-		{
-			if(_value.trim() == 'about:blank')
-			{
-				this.htmlNode.attr("src", _value);
-			}
-			else
-			{
-				// Load the new page, but display a loader
-				var loader = $j('<div class="et2_iframe loading"/>');
-				this.htmlNode
-					.before(loader);
-				window.setTimeout(jQuery.proxy(function() {
-					this.htmlNode.attr("src", _value)
-						.one('load',function() {
-							loader.remove();
-						});
-				},this),0);
-
-			}
-		}
-	},
-
-	/**
-	 * Sets the content of the iframe
-	 *
-	 * Sets the srcdoc attribute to the given value
-	 *
-	 * @param _value String Content of a document
-	 */
-	set_srcdoc: function(_value) {
-		this.htmlNode.attr("srcdoc", _value);
-	}
-});
-et2_register_widget(et2_iframe, ["iframe"]);

From f361373455f47c8cdbd2bc859075e58eba747b1c Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 4 Aug 2014 17:04:11 +0000
Subject: [PATCH 38/94] - Use timestamp to give cached dataFetch data a
 lifetime, currently 29 seconds. - Add another callback for cache
 registration, called whenever the cache is used.

---
 phpgwapi/js/jsapi/egw_data.js | 63 ++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 9 deletions(-)

diff --git a/phpgwapi/js/jsapi/egw_data.js b/phpgwapi/js/jsapi/egw_data.js
index 3c3a15b770..43f40c642f 100644
--- a/phpgwapi/js/jsapi/egw_data.js
+++ b/phpgwapi/js/jsapi/egw_data.js
@@ -24,6 +24,17 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 	 */
 	var KNOWN_UID_LIMIT = 200;
 
+	/**
+	 * Cache lifetime
+	 *
+	 * If cached results are used, we check their timestamp.  If the timestamp
+	 * is older than this, we will also ask for fresh data.  For cached data
+	 * younger than this, we only return the cache
+	 *
+	 * 29 seconds, 1 less then the fastest nextmatch autorefresh option
+	 */
+	var CACHE_LIFETIME = 29; // seconds
+
 	var lastModification = null;
 
 	/**
@@ -161,7 +172,7 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 			}
 
 			// Check to see if we need long-term caching of the query and its results
-			if(window.localStorage && _context.prefix && cacheCallback[_context.prefix])
+			if(window.localStorage && _context.prefix && cacheCallback[_context.prefix]  && !_context.no_cache)
 			{
 				// Ask registered callbacks if we should cache this
 				for(var i = 0; i < cacheCallback[_context.prefix].length; i++)
@@ -318,10 +329,39 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 						var cached = window.localStorage.getItem(cache_key);
 						if(cached)
 						{
-							egw.debug('log', 'Data cached query: ' + cache_key + "\nprocessing...");
-							// Call right away with cached data.  We'll still ask the server
-							// though.
-							parseServerResponse(JSON.parse(cached), _callback, _context);
+							cached = JSON.parse(cached);
+							var needs_update = true;
+
+							// Check timestamp
+							if(cached.lastModification && ((Date.now()/1000) - cached.lastModification) < CACHE_LIFETIME)
+							{
+								needs_update = false;
+							}
+
+							egw.debug('log', 'Data cached query from ' + new Date(cached.lastModification*1000)+': ' + cache_key + '('+
+								(needs_update ? 'will be' : 'will not be')+" updated)\nprocessing...");
+
+							// Call right away with cached data, but set no_cache flag
+							// to avoid re-caching this data with a new timestamp.
+							// We may still ask the server though.
+							var no_cache = _context.no_cache;
+							_context.no_cache = true;
+							parseServerResponse(cached, _callback, _context);
+							_context.no_cache = no_cache;
+
+
+							// If cache registrant wants notification of cache useage,
+							// let it know
+							if(cc.notification)
+							{
+								cc.notification.call(cc.context, needs_update);
+							}
+
+							if(!needs_update)
+							{
+								// Cached data is new enough, skip the server call
+								return;
+							}
 						}
 					}
 				}
@@ -356,20 +396,25 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 		 *
 		 * @param {string} prefix UID / Application prefix should match the
 		 *	individual record prefix
-		 * @param {function} callback A function that will analize the provided fetch
+		 * @param {function} callback_function A function that will analize the provided fetch
 		 *	parameters and return a reproducable cache key, or false to not cache
 		 *	the request.
+		 * @param {function} notice_function A function that will be called whenever
+		 *	cached data is used.  It is passed one parameter, a boolean that indicates
+		 *	if the server is or will be queried to refresh the cache.  Do not fetch additional data
+		 *	inside this callback, and return quickly.
 		 * @param {object} context Context for callback function.
 		 */
-		dataCacheRegister: function(prefix, callback, context)
+		dataCacheRegister: function(prefix, callback_function, notice_function, context)
 		{
 			if(typeof cacheCallback[prefix] == 'undefined')
 			{
 				cacheCallback[prefix] = [];
 			}
 			cacheCallback[prefix].push({
-				callback: callback,
-				context: context
+				callback: callback_function,
+				notification: notice_function || false,
+				context: context || null
 			});
 		},
 

From dcc6166212dff833ade76d7ef8139defdb95bca4 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 4 Aug 2014 17:04:45 +0000
Subject: [PATCH 39/94] Use cache callback to unlock folder tree immediately
 when the cache is used.

---
 mail/js/app.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 6411ecbd9a..16ae91036e 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -69,7 +69,17 @@ app.classes.mail = AppJS.extend(
 		// Turn on client side, persistent cache
 		// egw.data system runs encapsulated below etemplate, so this must be
 		// done before the nextmatch is created.
-		this.egw.dataCacheRegister('mail',this.nm_cache, this);
+		this.egw.dataCacheRegister('mail',
+			// Called to determine cache key
+			this.nm_cache,
+			// Called whenever cache is used
+			// TODO: Change this as needed
+			function(server_query)
+			{
+				if(!server_query) this.unlock_tree();
+			},
+			this
+		);
 	},
 
 	/**

From 1bb1d18997ad7b2beb8589ed8e3feee12b3d421d Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 5 Aug 2014 08:51:26 +0000
Subject: [PATCH 40/94] introduce some stuff to increase inital speed of
 mail-list by asyncronously calling gatherVacation and getQuotaRoot; increase
 cache-time on folderExists cache, trust a folder to be existant (or at least
 fot force the check with IMAP-Server) in get_rows

---
 mail/inc/class.mail_hooks.inc.php | 46 ++-----------------------------
 mail/inc/class.mail_ui.inc.php    | 18 ++++++------
 2 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php
index d18582f211..fe98690eb5 100644
--- a/mail/inc/class.mail_hooks.inc.php
+++ b/mail/inc/class.mail_hooks.inc.php
@@ -513,6 +513,7 @@ class mail_hooks
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 		$appname = 'mail';
 		$menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
+/*
 		$file = array();
 		$profileID = 0;
 		if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
@@ -545,6 +546,7 @@ class mail_hooks
 				//error_log(__METHOD__.__LINE__.' Key:'.$tmpkey.'->'.array2string($identities[$icServers->acc_id]));
 			}
 		}
+*/
 		$file=array();
 		// Destination div for folder tree
 		$file[] = array(
@@ -584,51 +586,7 @@ class mail_hooks
 		}
 		// display them all
 		display_sidebox($appname,$menu_title,$file);
-/*
-		unset($file);
-		if ($preferences && $sieveEnabledServerCounter)
-		{
-			$menu_title = lang('Sieve');
-			$linkData = array
-			(
-				'menuaction'	=> 'mail.mail_sieve.index',
-				'ajax'			=> 'true'
-			);
-			if(empty($preferences['prefpreventeditfilterrules']) || $preferences['prefpreventeditfilterrules'] == 0)
-				$file['filter rules']	= egw::link('/index.php',$linkData);
 
-			$linkData = array
-			(
-				'menuaction'	=> 'mail.mail_sieve.editVacation',
-				'ajax'			=> 'true'
-			);
-			if(empty($preferences['prefpreventabsentnotice']) || $preferences['prefpreventabsentnotice'] == 0)
-			{
-				$file['vacation notice']	= egw::link('/index.php',$linkData);
-			}
-			if((empty($preferences['prefpreventnotificationformailviaemail']) ||
-				$preferences['prefpreventnotificationformailviaemail'] == 0))
-			{
-				$file['email notification'] = egw::link('/index.php','menuaction=mail.mail_sieve.editEmailNotification&ajax=true'); //Added email notifications
-			}
-			if ($sieveEnabledServerCounter>=1)
-			{
-				if($sieveEnabledServerCounter==1 && ($icServer instanceof defaultimap)) {
-					if($icServer->enableSieve)
-					{
-						if (count($file)) display_sidebox($appname,$menu_title,$file);
-						unset($file);
-					}
-				}
-				else
-				{
-					if (count($file)) display_sidebox($appname,$menu_title,$file);
-					unset($file);
-				}
-			}
-
-		}
-*/
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index db11b4467a..1c9af7e2d8 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -440,9 +440,8 @@ class mail_ui
 					unset($msg);
 					unset($content['msg']);
 				}
-
-				$quota = $this->mail_bo->getQuotaRoot();
-
+				// call getQuotaRoot asynchronously in getRows by initiating a client Server roundtrip
+				$quota = false;//$this->mail_bo->getQuotaRoot();
 				if($quota !== false && $quota['limit'] != 'NOT SET') {
 					$quotainfo = $this->quotaDisplay($quota['usage'], $quota['limit']);
 					$content[self::$nm_index]['quota'] = $sel_options[self::$nm_index]['quota'] = $quotainfo['text'];
@@ -454,8 +453,8 @@ class mail_ui
 					$content[self::$nm_index]['quotaclass'] = $sel_options[self::$nm_index]['quotaclass'] = "mail_DisplayNone";
 					$content[self::$nm_index]['quotanotsupported'] = $sel_options[self::$nm_index]['quotanotsupported'] = "mail_DisplayNone";
 				}
-
-				$vacation = $this->gatherVacation();
+				// call gatherVacation asynchronously in getRows by initiating a client Server roundtrip
+				$vacation = false;//$this->gatherVacation();
 				//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation));
 				if($vacation) {
 					if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date'))
@@ -1478,13 +1477,13 @@ class mail_ui
 		//save selected Folder to sessionData (mailbox)->currentFolder
 		if (isset($query['selectedFolder'])) $this->mail_bo->sessionData['mailbox']=$_folderName;
 		$toSchema = false;//decides to select list schema with column to selected (if false fromaddress is default)
-		if ($this->mail_bo->folderExists($_folderName,true))
+		if ($this->mail_bo->folderExists($_folderName))
 		{
 			$toSchema = $this->mail_bo->isDraftFolder($_folderName)||$this->mail_bo->isSentFolder($_folderName)||$this->mail_bo->isTemplateFolder($_folderName);
 		}
 		else
 		{
-			error_log(__METHOD__.__LINE__.' Test on Folder:'.$_folderName.' failed; Using INBOX instead');
+			//error_log(__METHOD__.__LINE__.' Test on Folder:'.$_folderName.' failed; Using INBOX instead');
 			$query['selectedFolder']=$this->mail_bo->sessionData['mailbox']=$_folderName='INBOX';
 		}
 		$this->mail_bo->saveSessionData();
@@ -1576,13 +1575,16 @@ class mail_ui
 			$sR=array();
 			self::callWizard($e->getMessage(), false);
 		}
+		$response = egw_json_response::get();
 		// unlock immediately after fetching the rows
 		if (stripos($_GET['menuaction'],'ajax_get_rows')!==false)
 		{
 			//error_log(__METHOD__.__LINE__.' unlock tree ->'.$_GET['menuaction']);
-			$response = egw_json_response::get();
 			$response->call('app.mail.unlock_tree');
 		}
+		// done asynchronously initiating a client->server roundtrip to save time on the initial call
+		$response->call('app.mail.mail_callRefreshVacationNotice',$this->mail_bo->profileID);
+		$response->call('app.mail.mail_refreshQuotaDisplay',$this->mail_bo->profileID);
 		if (is_array($sR) && count($sR)>0)
 		{
 			foreach ((array)$sR as $key => $v)

From 19ff0d23ccc29ac3517f960d0eb0145eb9d67630 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 5 Aug 2014 09:26:28 +0000
Subject: [PATCH 41/94] Try to catch exceptions from Sieve retriveRuels, and
 call emailadminWizard

---
 mail/inc/class.mail_ui.inc.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 1c9af7e2d8..e6d59863b7 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -2294,9 +2294,13 @@ class mail_ui
 		if ($vacation)
 		{
 			$sieveServer = $this->mail_bo->icServer;
-		
-			$sieveServer->retrieveRules();
-			$vacation = $sieveServer->getVacation();
+			try
+			{
+				$sieveServer->retrieveRules();
+				$vacation = $sieveServer->getVacation();
+			} catch (PEAR_Exception $ex) {
+				$this->callWizard($ex->getMessage());
+			}
 		}
 		//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Vacation retrieved:'.array2string($vacation));
 		return $vacation;

From 98cd4bbe28b44b388772a53e613fc4f6298dc2dd Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 5 Aug 2014 11:59:06 +0000
Subject: [PATCH 42/94] using cache more efficiently; prevent clearing cache on
 profileChange; hook into clear_cache callable from admin

---
 mail/inc/class.mail_ui.inc.php | 4 ++--
 mail/setup/setup.inc.php       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index e6d59863b7..789dd469a0 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -123,7 +123,7 @@ class mail_ui
 		}
 
 		try {
-			$this->mail_bo = mail_bo::getInstance(true,self::$icServerID);
+			$this->mail_bo = mail_bo::getInstance(true,self::$icServerID,$_validate=true, $_oldImapServerObject=false, $_reuseCache=true);
 			if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 			//error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
 			
@@ -207,7 +207,7 @@ class mail_ui
 		if (mail_bo::$debug) error_log(__METHOD__.__LINE__.'->'.self::$icServerID.'<->'.$_icServerID);
 
 		if ($unsetCache) emailadmin_imapbase::unsetCachedObjects(self::$icServerID);
-		$this->mail_bo = mail_bo::getInstance(false,self::$icServerID);
+		$this->mail_bo = mail_bo::getInstance(false,self::$icServerID,$_validate=true, $_oldImapServerObject=false, $_reuseCache=true);
 		if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 		// no icServer Object: something failed big time
 		if (!isset($this->mail_bo->icServer) || $this->mail_bo->icServer->ImapServerId<>$_icServerID)
diff --git a/mail/setup/setup.inc.php b/mail/setup/setup.inc.php
index cebc187d3b..5bf8d231c2 100644
--- a/mail/setup/setup.inc.php
+++ b/mail/setup/setup.inc.php
@@ -34,6 +34,7 @@ $setup_info['mail']['hooks']['settings'] = 'mail_hooks::settings';
 $setup_info['mail']['hooks']['sidebox_menu'] = 'mail_hooks::sidebox_menu';
 $setup_info['mail']['hooks']['session_creation'] = 'mail_bo::resetConnectionErrorCache';
 $setup_info['mail']['hooks']['verify_settings'] = 'mail_bo::forcePrefReload';
+$setup_info['mail']['hooks']['clear_cache'] = 'mail_bo::unsetCachedObjects';
 $setup_info['mail']['hooks']['check_notify'] = 'mail_hooks::notification_check_mailbox';
 $setup_info['mail']['hooks']['edit_user'] = 'mail_hooks::edit_user';
 

From 70d85ca78fde30daaf1831aa07a7577f8043346d Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 5 Aug 2014 23:27:06 +0000
Subject: [PATCH 43/94] Fix addressbook CRM next/previous buttons don't update
 nextmatch

---
 addressbook/inc/class.addressbook_ui.inc.php | 4 ++--
 addressbook/js/app.js                        | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 7da613345c..d689bb5332 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -2366,7 +2366,7 @@ window.egw_LAB.wait(function() {
 							case 'infolog':
 							case 'tracker':
 							default:
-								egw_json_response::get()->apply('app.addressbook.view_set_list',Array('linked',$contact_id));
+								egw_json_response::get()->apply('app.addressbook.view_set_list',Array(Array('action'=>'addressbook', 'action_id' => $contact_id)));
 								break;
 						}
 
@@ -2387,7 +2387,6 @@ window.egw_LAB.wait(function() {
 					'ajax' => 'true'
 				));
 			}
-			$content['jpegphoto'] = !empty($content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 			if (isset($_GET['index']))
 			{
 				$content['index'] = (int)$_GET['index'];
@@ -2399,6 +2398,7 @@ window.egw_LAB.wait(function() {
 				$num_rows = $this->get_rows($query, $rows, $readonlys, true);
 			}
 		}
+		$content['jpegphoto'] = !empty($content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 
 		// make everything not explicit mentioned readonly
 		$readonlys['__ALL__'] = true;
diff --git a/addressbook/js/app.js b/addressbook/js/app.js
index 9131188aae..cab4855dda 100644
--- a/addressbook/js/app.js
+++ b/addressbook/js/app.js
@@ -104,10 +104,9 @@ app.classes.addressbook = AppJS.extend(
 	/**
 	 * Set link filter for the already open & rendered  list
 	 *
-	 * @param {string} col_filter_name Name of the column filter to set
-	 * @param {string} contact_id New contact ID
+	 * @param {Object} filter Object with key / value pairs of filters to set
 	 */
-	view_set_list: function(col_filter_name, contact_id)
+	view_set_list: function(filter)
 	{
 		// Find the infolog list
 		var list = etemplate2.getById(
@@ -116,9 +115,6 @@ app.classes.addressbook = AppJS.extend(
 		var nm = list ? list.widgetContainer.getWidgetById('nm') : null;
 		if(nm)
 		{
-			// Update the link filter to new contact
-			var filter = {col_filter:{}};
-			filter.col_filter[col_filter_name] = 'addressbook:'+contact_id;
 			nm.applyFilters(filter);
 		}
 	},

From 4830bcf78471dee0cd37cff2b014f4474c4a574b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 6 Aug 2014 10:56:01 +0000
Subject: [PATCH 44/94] Try to cache vacation for each account to avoid to
 connect to IMAP server if vacation rules are not changed

---
 mail/inc/class.mail_sieve.inc.php |  2 ++
 mail/inc/class.mail_ui.inc.php    | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php
index 3471906609..54a531b03a 100644
--- a/mail/inc/class.mail_sieve.inc.php
+++ b/mail/inc/class.mail_sieve.inc.php
@@ -620,6 +620,8 @@ class mail_sieve
 									{
 										self::setAsyncJob($newVacation);
 									}
+									//Reset vacationNotice cache which is used in mail_ui get_rows
+									egw_cache::unsetCache(egw_cache::INSTANCE,'email', 'vacationNotice'+$icServer->acc_id);
 									$msg = lang('Vacation notice sucessfully updated.');
 								}
 							}
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 789dd469a0..b0096c1410 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -2296,8 +2296,20 @@ class mail_ui
 			$sieveServer = $this->mail_bo->icServer;
 			try
 			{
-				$sieveServer->retrieveRules();
-				$vacation = $sieveServer->getVacation();
+				//Get vacation from cache if it's available
+				$vacationCached = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$sieveServer->acc_id);
+				
+				if (!$vacationCached)
+				{
+					$sieveServer->retrieveRules();
+					$vacation = $sieveServer->getVacation();
+					// Set vacation to the instance cache for particular account
+					egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$sieveServer->acc_id, $vacation);
+				}
+				else
+				{
+					return $vacationCached;
+				}
 			} catch (PEAR_Exception $ex) {
 				$this->callWizard($ex->getMessage());
 			}

From cb43eb44c4a08a42e9c82fbf8d5b70c0b2687c37 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 6 Aug 2014 10:58:04 +0000
Subject: [PATCH 45/94] Add missing column in timesheet idex template, which
 were causing customfields not shown on the list

---
 timesheet/templates/default/index.xet | 1 +
 1 file changed, 1 insertion(+)

diff --git a/timesheet/templates/default/index.xet b/timesheet/templates/default/index.xet
index 9656a67858..24f3489cdc 100644
--- a/timesheet/templates/default/index.xet
+++ b/timesheet/templates/default/index.xet
@@ -15,6 +15,7 @@
 	<template id="timesheet.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
+				<column/>
 				<column width="15%"/>
 				<column width="50%"/>
 				<column/>

From 687ed8746c701762a02185e404e6b8d810209dc3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 6 Aug 2014 14:30:18 +0000
Subject: [PATCH 46/94] Fix sort by account created or modified gives SQL error

---
 admin/inc/class.admin_ui.inc.php  | 2 +-
 admin/templates/default/index.xet | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/inc/class.admin_ui.inc.php b/admin/inc/class.admin_ui.inc.php
index 71ec94f0b9..c21ea2ed6b 100644
--- a/admin/inc/class.admin_ui.inc.php
+++ b/admin/inc/class.admin_ui.inc.php
@@ -55,7 +55,7 @@ class admin_ui
 			'order' => 'account_lid',
 			'sort' => 'ASC',
 			'row_id' => 'account_id',
-			'default_cols' => '!account_id,account_created',
+			'default_cols' => '!account_id,created',
 			'actions' => self::user_actions(),
 		);
 		//$content['msg'] = 'Hi Ralf ;-)';
diff --git a/admin/templates/default/index.xet b/admin/templates/default/index.xet
index 01173328fd..b31b5acbf0 100644
--- a/admin/templates/default/index.xet
+++ b/admin/templates/default/index.xet
@@ -27,8 +27,8 @@
 					<nextmatch-sortheader label="EMail" id="account_email"/>
 					<nextmatch-sortheader label="Primary group" id="account_primary_group"/>
 					<nextmatch-sortheader label="Expires" id="account_expires"/>
-					<nextmatch-sortheader label="Created" id="account_created"/>
-					<nextmatch-sortheader label="Last modified" id="account_modified"/>
+					<nextmatch-sortheader label="Created" id="created"/>
+					<nextmatch-sortheader label="Last modified" id="modified"/>
 				</row>
 				<row class="$row_cont[status_class]">
 					<description id="${row}[account_lid]" no_lang="1"/>

From 77c08a8cc414e1e3e91ffc5217242c363dca109d Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 6 Aug 2014 15:01:35 +0000
Subject: [PATCH 47/94] Fix delete button for extended acl (eacl) was always
 read-only, except for superuser.

---
 filemanager/inc/class.filemanager_ui.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index faef24ed7f..f7f61cccb7 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -1118,7 +1118,7 @@ class filemanager_ui
 				unset($readonlys['tabs']['filemanager.file.eacl']);	// --> switch the tab on again
 				foreach($content['eacl'] as &$eacl)
 				{
-					$eacl['path'] = parse_url($eacl['path'],PHP_URL_PATH);
+					$eacl['path'] = rtrim(parse_url($eacl['path'],PHP_URL_PATH),'/');		
 					$readonlys['delete['.$eacl['ino'].'-'.$eacl['owner'].']'] = $eacl['ino'] != $content['ino'] ||
 						$eacl['path'] != $content['path'] || !$content['is_owner'];
 				}

From f19666096e3b10f6a407ad60434cb3bddc2ec2cc Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 6 Aug 2014 20:53:37 +0000
Subject: [PATCH 48/94] Remove extra call to refresh vacation & quota, it is
 already done when changing folder which should be often enough.

---
 mail/inc/class.mail_ui.inc.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index b0096c1410..54031faba9 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1582,9 +1582,7 @@ class mail_ui
 			//error_log(__METHOD__.__LINE__.' unlock tree ->'.$_GET['menuaction']);
 			$response->call('app.mail.unlock_tree');
 		}
-		// done asynchronously initiating a client->server roundtrip to save time on the initial call
-		$response->call('app.mail.mail_callRefreshVacationNotice',$this->mail_bo->profileID);
-		$response->call('app.mail.mail_refreshQuotaDisplay',$this->mail_bo->profileID);
+		
 		if (is_array($sR) && count($sR)>0)
 		{
 			foreach ((array)$sR as $key => $v)

From a09fae5f439a7dc0ef649e0cdc8f26add8b8c2a2 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 6 Aug 2014 21:00:31 +0000
Subject: [PATCH 49/94] Data improvements: - pass UID as additional parameter
 to data callbacks - cache actual data separately from cached fetch response
 to avoid duplication - use callbacks to keep localStorage data consistent
 with data in memory - use callback to update cached fetch response if a
 record is removed (set to null)

---
 phpgwapi/js/jsapi/egw_data.js | 77 +++++++++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 7 deletions(-)

diff --git a/phpgwapi/js/jsapi/egw_data.js b/phpgwapi/js/jsapi/egw_data.js
index 43f40c642f..a3eec27e9a 100644
--- a/phpgwapi/js/jsapi/egw_data.js
+++ b/phpgwapi/js/jsapi/egw_data.js
@@ -35,6 +35,12 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 	 */
 	var CACHE_LIFETIME = 29; // seconds
 
+	/**
+	 * Cached fetches are differentiated from actual results by using this prefix
+	 * @type String
+	 */
+	var CACHE_KEY_PREFIX = 'cached_fetch_';
+
 	var lastModification = null;
 
 	/**
@@ -75,9 +81,11 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 		var indexes = [];
 		for(var i = 0; i < window.localStorage.length; i++)
 		{
-			if(window.localStorage.key(i).indexOf('cache_'+_prefix) == 0)
+			var key = window.localStorage.key(i);
+
+			// This is a cached fetch for many rows
+			if(key.indexOf(CACHE_KEY_PREFIX+_prefix) == 0)
 			{
-				var key = window.localStorage.key(i);
 				var cached = JSON.parse(window.localStorage.getItem(key));
 
 				if(cached.lastModification)
@@ -93,6 +101,23 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 					window.localStorage.removeItem(key);
 				}
 			}
+			// Actual cached data
+			else if (key.indexOf(_prefix) == 0)
+			{
+				var cached = JSON.parse(window.localStorage.getItem(key));
+				if(cached.timestamp)
+				{
+					indexes.push({
+						key: key,
+						lastModification: cached.timestamp
+					});
+				}
+				else
+				{
+					// No way to know how old it is, just remove it
+					window.localStorage.removeItem(key);
+				}
+			}
 		}
 		// Nothing for that prefix?  Clear all cached data.
 		if(_prefix && indexes.length == 0)
@@ -181,9 +206,37 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 					var cache_key = false
 					if(cache_key = cc.callback.call(cc.context, _context))
 					{
-						cache_key = 'cache_' + _context.prefix + '::' + cache_key;
+						cache_key = CACHE_KEY_PREFIX + _context.prefix + '::' + cache_key;
 						try
 						{
+							for (var key in _result.data)
+							{
+								var uid = UID(key, (typeof _context == "object" && _context != null) ? _context.prefix : "");
+								
+								// Register a handler on each data so we can know if it is updated or removed
+								egw.dataUnregisterUID(uid, null, cache_key);
+								egw.dataRegisterUID(uid, function(data, _uid) {
+									// If data item is removed, remove it from cached fetch too
+									if(data == null)
+									{
+										var cached = JSON.parse(window.localStorage[this]) || false;
+										if(cached && cached.order && cached.order.indexOf(_uid) >= 0)
+										{
+											cached.order.splice(cached.order.indexOf(_uid),1);
+											if(cached.total) cached.total--;
+											window.localStorage[this] = JSON.stringify(cached);
+										}
+										window.localStorage.removeItem(_uid);
+									}
+									else
+									{
+										// Update or store data in long-term storage
+										window.localStorage[_uid] = JSON.stringify({timestamp: (new Date).getTime(), data: data});
+									}
+								},cache_key);
+							}
+							// Don't keep data in long-term cache with request also
+							_result.data = {};
 							window.localStorage.setItem(cache_key,JSON.stringify(_result));
 						}
 						catch (e)
@@ -324,7 +377,7 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 					var cache_key = false
 					if(cache_key = cc.callback.call(cc.context, _context))
 					{
-						cache_key = 'cache_' + _context.prefix + '::' + cache_key;
+						cache_key = CACHE_KEY_PREFIX + _context.prefix + '::' + cache_key;
 
 						var cached = window.localStorage.getItem(cache_key);
 						if(cached)
@@ -388,7 +441,7 @@ egw.extend("data", egw.MODULE_APP_LOCAL, function (_app, _wnd) {
 		/**
 		 * Turn on long-term client side cache of a particular request
 		 * (cache the nextmatch query results) for fast, immediate response
-		 * with old data.
+		 * with old data.  
 		 *
 		 * The request is still sent to the server, and the cache is updated
 		 * with fresh data, and any needed callbacks are called again with
@@ -509,6 +562,9 @@ egw.extend("data_storage", egw.MODULE_GLOBAL, function (_app, _wnd) {
 
 				// Delete the data from the localStorage
 				delete localStorage[uid];
+
+				// We don't clean long-term storage because of age until it runs
+				// out of space
 			}
 		}
 	}, CLEANUP_INTERVAL);
@@ -551,7 +607,13 @@ egw.extend("data_storage", egw.MODULE_GLOBAL, function (_app, _wnd) {
 			{
 				// Update the timestamp and call the given callback function
 				localStorage[_uid].timestamp = (new Date).getTime();
-				_callback.call(_context, localStorage[_uid].data);
+				_callback.call(_context, localStorage[_uid].data, _uid);
+			}
+			// Check long-term storage
+			else if(window.localStorage && window.localStorage[_uid])
+			{
+				localStorage[_uid] = JSON.parse(window.localStorage[_uid]);
+				_callback.call(_context, localStorage[_uid].data, _uid);
 			}
 			else if (_execId && _widgetId)
 			{
@@ -694,7 +756,8 @@ egw.extend("data_storage", egw.MODULE_GLOBAL, function (_app, _wnd) {
 					try {
 						registeredCallbacks[_uid][i].callback.call(
 							registeredCallbacks[_uid][i].context,
-							_data
+							_data,
+							_uid
 						);
 					} catch (e) {
 						// Remove this callback from the list

From a28cbb4d7eedf362650e18a7da14d3eee60323b3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 6 Aug 2014 21:13:27 +0000
Subject: [PATCH 50/94] - Fix cache key to include sorting - Fix cache key for
 initial load, was missing selected folder - Avoid deleting data, it causes
 blank rows.  Refreshing instead.

---
 mail/js/app.js | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 16ae91036e..db5f4585fc 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -76,6 +76,7 @@ app.classes.mail = AppJS.extend(
 			// TODO: Change this as needed
 			function(server_query)
 			{
+				// Unlock tree if using a cache, since the server won't
 				if(!server_query) this.unlock_tree();
 			},
 			this
@@ -290,11 +291,32 @@ app.classes.mail = AppJS.extend(
 			!query_context.self._filters || query_context.self._filters.search || false)
 		)
 		{
+			// Tree is not a child of nextmatch, so we need to
+			// set nextmatch filter 'selectedFolder' to initial value, but in that
+			// case, the normal structure is not fully set up yet.
+			if(!query_context.self._filters.selectedFolder && query_context.self._widget)
+			{
+				var tree = query_context.self._widget;
+				while(tree.getParent() != null)
+				{
+					// find root
+					tree = tree.getParent();
+				}
+				if(tree)
+				{
+					tree = tree.getWidgetById('nm[foldertree]');
+				}
+				if(tree)
+				{
+					query_context.self._filters.selectedFolder = tree.getValue();
+				}
+			}
 			// Make sure keys match, even if some filters are not defined
 			return JSON.stringify({
 				selectedFolder: query_context.self._filters.selectedFolder || '',
 				filter: query_context.self._filters.filter || '',
-				filter2: query_context.self._filters.filter2
+				filter2: query_context.self._filters.filter2 || '',
+				sort: query_context.self._filters.sort
 			});
 		}
 		return false;
@@ -322,10 +344,9 @@ app.classes.mail = AppJS.extend(
 		{
 			if (_reset == true)
 			{
-				//var nm = this.et2.getWidgetById(nm_index);
-				//if (this.mail_currentlyFocussed!='') nm.refresh([this.mail_currentlyFocussed],'delete');//egw.dataDeleteUID(this.mail_currentlyFocussed);
-				if (this.mail_currentlyFocussed!='') egw.dataDeleteUID(this.mail_currentlyFocussed);
-				for(var k = 0; k < this.mail_selectedMails.length; k++) egw.dataDeleteUID(this.mail_selectedMails[k]);
+				// Request updated data, if possible
+				if (this.mail_currentlyFocussed!='') egw.dataRefreshUID(this.mail_currentlyFocussed);
+				for(var k = 0; k < this.mail_selectedMails.length; k++) egw.dataRefreshUID(this.mail_selectedMails[k]);
 				//nm.refresh(this.mail_selectedMails,'delete');
 			}
 			this.mail_selectedMails = [];
@@ -1620,7 +1641,6 @@ app.classes.mail = AppJS.extend(
 		// Update non-grid
 		this.mail_refreshFolderStatus(_folder,'forced',false,false);
 		this.mail_refreshQuotaDisplay(server[0]);
-		this.mail_fetchCurrentlyFocussed(null,true);
 		this.mail_preview();
 		if (server[0]!=previousServer[0])
 		{

From 1d8c630a170c546f5a03265f2f501bf22262812c Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 7 Aug 2014 12:57:33 +0000
Subject: [PATCH 51/94] Lock mail tree by clicking on "empty trash" action and
 unlock it after the operation is finished

---
 mail/js/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index db5f4585fc..341722466f 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1541,7 +1541,8 @@ app.classes.mail = AppJS.extend(
 		var server = _senders[0].iface.id.split('::');
 		var self = this;
 		this.egw.message(this.egw.lang('empty trash'));
-		egw.json('mail.mail_ui.ajax_emptyTrash',[server[0]],function(){self.lock_tree();})
+		this.lock_tree();
+		egw.json('mail.mail_ui.ajax_emptyTrash',[server[0]],function(){self.unlock_tree();})
 			.sendRequest(true);
 	},
 

From 449dea5553fabfea73c8c4ee7b6a922734dbf44b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 7 Aug 2014 15:56:25 +0000
Subject: [PATCH 52/94] Unlock mail folder tree after setFolderStatus operation
 is finished

---
 mail/js/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 341722466f..fb4b3a83cb 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1132,10 +1132,11 @@ app.classes.mail = AppJS.extend(
 	 */
 	mail_queueRefreshFolderList: function(_folders)
 	{
+		var self = this;
 		// as jsonq is too fast wrap it to be delayed a bit, to ensure the folder actions
 		// are executed last of the queue
 		window.setTimeout(function() {
-			egw.jsonq('mail.mail_ui.ajax_setFolderStatus',[_folders]);
+			egw.jsonq('mail.mail_ui.ajax_setFolderStatus',[_folders], function (){self.unlock_tree()});
 		}, 100);
 	},
 

From 6e70592d4c4faa3dff4b73eaa8a55404b424800b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 7 Aug 2014 16:31:28 +0000
Subject: [PATCH 53/94] Change width of fields in project manager tab of
 infolog edit dialog

---
 infolog/templates/default/app.css   |  6 +++++-
 infolog/templates/default/edit.xet  |  4 ++--
 infolog/templates/pixelegg/app.css  | 10 +++++-----
 infolog/templates/pixelegg/app.less |  8 --------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css
index d2d54f4df9..ce0ffe9b2f 100644
--- a/infolog/templates/default/app.css
+++ b/infolog/templates/default/app.css
@@ -35,7 +35,7 @@ table.infolog_fullWidth { width: 100%; }
 /* date-duration styling in project manager tab */
 .infolog_date_duration:first-child input.et2_date_duration{
 	float: left;
-	width:88px;
+	width:137px;
 }
 .infolog_date_duration select.et2_date_duration {
 	width: 52%;
@@ -51,4 +51,8 @@ tr.dialogHeader td, tr.dialogHeader2 td, tr.dialogHeader3 td, tr.dialogHeader4 t
 tr.dialogOperators td,.dialogFooterToolbar {
 	padding: 5px 0 5px 0;
 	vertical-align: middle;
+}
+/*Project Name*/
+#infolog-edit_infolog-edit-project .et2_link_entry.no_app input.ui-autocomplete-input {
+  width: 291px;
 }
\ No newline at end of file
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index e593e866f1..ee8c5d5a4f 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -30,7 +30,7 @@
 		<grid width="100%" height="245">
 			<columns>
 				<column width="80" class="infolog_normalWrap"/>
-				<column width="90"/>
+				<column width="190"/>
 				<column width="100"/>
 				<column/>
 			</columns>
@@ -40,7 +40,7 @@
 				</row>
 				<row class="row">
 					<description value="Project"/>
-					<link-entry id="pm_id" onchange="1" only_app='projectmanager' blur='None'/>
+					<link-entry id="pm_id" onchange="1" only_app='projectmanager' blur='None' class="infolog_projectName"/>
 				</row>
 				<row class="row">
 					<description value="Price"/>
diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css
index 01cc9bea33..99d0d2c053 100755
--- a/infolog/templates/pixelegg/app.css
+++ b/infolog/templates/pixelegg/app.css
@@ -105,7 +105,7 @@ table.infolog_fullWidth {
 /* date-duration styling in project manager tab */
 .infolog_date_duration:first-child input.et2_date_duration {
   float: left;
-  width: 88px;
+  width: 137px;
 }
 .infolog_date_duration select.et2_date_duration {
   width: 52%;
@@ -125,6 +125,10 @@ tr.dialogOperators td,
   padding: 5px 0 5px 0;
   vertical-align: middle;
 }
+/*Project Name*/
+#infolog-edit_infolog-edit-project .et2_link_entry.no_app input.ui-autocomplete-input {
+  width: 291px;
+}
 /* #############################################################################
 // iframe
 // Rahmen + padding**/
@@ -384,9 +388,5 @@ input#infolog-edit_info_subject {
 #infolog-edit_infolog-edit-delegation .inputFullWidth input {
   width: 96%;
 }
-/*Projektmanager*/
-#infolog-edit_infolog-edit-project .et2_link_entry.no_app input.ui-autocomplete-input {
-  width: auto;
-}
 /*Historie*/
 /**/
diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less
index 9d7c80e2a2..deed78cb57 100755
--- a/infolog/templates/pixelegg/app.less
+++ b/infolog/templates/pixelegg/app.less
@@ -398,14 +398,6 @@ input#infolog-edit_info_subject {width: 98% !important;}
 }
 
 
-/*Projektmanager*/
-#infolog-edit_infolog-edit-project{
-.et2_link_entry.no_app input.ui-autocomplete-input {
-    width: auto;
-}
-
-}
-
 /*Historie*/
 
 

From 6b015a9448ee5c6669e5ac3e135825f39965c653 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 8 Aug 2014 10:04:49 +0000
Subject: [PATCH 54/94] Refresh the nm and lock the tree if current active
 folder is the Trash Folder, when calling "Empty Trash" action, otherwise no
 need to refresh or lock the tree

---
 mail/inc/class.mail_ui.inc.php | 16 ++++++++++------
 mail/js/app.js                 |  5 +++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 54031faba9..ab1b67a909 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -4020,16 +4020,17 @@ class mail_ui
 	}
 
 	/**
-	 * empty trash folder - its called via json, so the function must start with ajax (or the class-name must contain ajax)
+	 * Empty trash folder
 	 *
 	 * @param string $icServerID id of the server to empty its trashFolder
+	 * @param string $selectedFolder seleted(active) folder by nm filter
 	 * @return nothing
 	 */
-	function ajax_emptyTrash($icServerID)
+	function ajax_emptyTrash($icServerID, $selectedFolder)
 	{
 		//error_log(__METHOD__.__LINE__.' '.$icServerID);
 		translation::add_app('mail');
-
+		$response = egw_json_response::get();
 		$rememberServerID = $this->mail_bo->profileID;
 		if ($icServerID && $icServerID != $this->mail_bo->profileID)
 		{
@@ -4038,20 +4039,23 @@ class mail_ui
 		}
 		$trashFolder = $this->mail_bo->getTrashFolder();
 		if(!empty($trashFolder)) {
+			if ($selectedFolder == $icServerID.self::$delimiter.$trashFolder)
+			{
+				// Lock the tree if the active folder is Trash folder
+				$response->call('app.mail.lock_tree');
+			}
 			$this->mail_bo->compressFolder($trashFolder);
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
 		{
 			$oldFolderInfo = $this->mail_bo->getFolderStatus($trashFolder,false,false,false);
-			$response = egw_json_response::get();
 			$response->call('egw.message',lang('empty trash'));
 			$response->call('app.mail.mail_reloadNode',array($icServerID.self::$delimiter.$trashFolder=>$oldFolderInfo['shortDisplayName']));
 			//error_log(__METHOD__.__LINE__.' change Profile to ->'.$rememberServerID);
 			$this->changeProfile($rememberServerID);
 		}
-		else
+		else if ($selectedFolder == $icServerID.self::$delimiter.$trashFolder)
 		{
-			$response = egw_json_response::get();
 			$response->call('egw.refresh',lang('empty trash'),'mail');
 		}
 	}
diff --git a/mail/js/app.js b/mail/js/app.js
index fb4b3a83cb..927ac00376 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1540,10 +1540,11 @@ app.classes.mail = AppJS.extend(
 	 */
 	mail_emptyTrash: function(action,_senders) {
 		var server = _senders[0].iface.id.split('::');
+		var activeFilters = this.mail_getActiveFilters();
 		var self = this;
+		
 		this.egw.message(this.egw.lang('empty trash'));
-		this.lock_tree();
-		egw.json('mail.mail_ui.ajax_emptyTrash',[server[0]],function(){self.unlock_tree();})
+		egw.json('mail.mail_ui.ajax_emptyTrash',[server[0], activeFilters['selectedFolder']? activeFilters['selectedFolder']:null],function(){self.unlock_tree()})
 			.sendRequest(true);
 	},
 

From f22b156f21a35e7e757913d995e63c62ded5a140 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 8 Aug 2014 13:36:33 +0000
Subject: [PATCH 55/94] Add msg_type to callWizard to be able to set message
 type when we call emailadminWizard

---
 mail/inc/class.mail_ui.inc.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index ab1b67a909..ce8597ac44 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -142,7 +142,7 @@ class mail_ui
 		catch (Exception $e)
 		{
 			// redirect to mail wizard to handle it (redirect works for ajax too)
-			self::callWizard($e->getMessage());
+			self::callWizard($e->getMessage(),true,'error');
 		}
 		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
 	}
@@ -152,8 +152,9 @@ class mail_ui
 	 *
 	 * @param string $message
 	 * @param boolean $exit If true, will call common::egw_exit() after opening the wizardpopup
+	 * @param string $msg_type = 'success' message type
 	 */
-	static function callWizard($message, $exit=true)
+	static function callWizard($message, $exit=true, $msg_type='success')
 	{
 		//error_log(__METHOD__."('$message', $exit) ".function_backtrace());
 		$linkData=(self::$icServerID ? array(
@@ -162,7 +163,8 @@ class mail_ui
 			) : array(
 				'menuaction' => 'mail.mail_wizard.add',
 			)) + array(
-				'msg' => $message
+				'msg' => $message,
+				'msg_type' => $msg_type
 			);
 
 		if (egw_json_response::isJSONResponse())
@@ -679,7 +681,7 @@ class mail_ui
 		}
 		catch (Exception $e)
 		{
-			self::callWizard($e->getMessage());
+			self::callWizard($e->getMessage(),true, 'error');
 		}
 		return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
 	}
@@ -807,7 +809,7 @@ class mail_ui
 			$folderObjects=array();
 			if ($_popWizard)
 			{
-				self::callWizard($e->getMessage(), false);
+				self::callWizard($e->getMessage(), false, 'error');
 			}
 			$c = 1;
 		}
@@ -1573,7 +1575,7 @@ class mail_ui
 		{
 			$sortResultwH=array();
 			$sR=array();
-			self::callWizard($e->getMessage(), false);
+			self::callWizard($e->getMessage(), false, 'error');
 		}
 		$response = egw_json_response::get();
 		// unlock immediately after fetching the rows
@@ -2309,7 +2311,7 @@ class mail_ui
 					return $vacationCached;
 				}
 			} catch (PEAR_Exception $ex) {
-				$this->callWizard($ex->getMessage());
+				$this->callWizard($ex->getMessage(), true, 'error');
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Vacation retrieved:'.array2string($vacation));
@@ -3883,7 +3885,7 @@ class mail_ui
 				$this->changeProfile($icServerID);
 			}
 			catch (Exception $e) {
-				self::callWizard($e->getMessage(),true);
+				self::callWizard($e->getMessage(),true, 'error');
 			}
 
 		}

From cb093e7266b622b5657d63954b36eefbc2a3776d Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 11 Aug 2014 12:14:27 +0000
Subject: [PATCH 56/94] Avoid to call mail constructor (openConnection is an
 expensive operation) when client-side ask for vacationNotice. -Check if
 there's no vacation cached then create mail object (try openConnection) and
 ask for vacation -Add account_lid to cached vacations to distinguished them
 in case if the mail account was a shared profile

---
 mail/inc/class.mail_sieve.inc.php |  5 +++-
 mail/inc/class.mail_ui.inc.php    | 47 ++++++++++++++++---------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php
index 54a531b03a..dac08bf07b 100644
--- a/mail/inc/class.mail_sieve.inc.php
+++ b/mail/inc/class.mail_sieve.inc.php
@@ -621,7 +621,10 @@ class mail_sieve
 										self::setAsyncJob($newVacation);
 									}
 									//Reset vacationNotice cache which is used in mail_ui get_rows
-									egw_cache::unsetCache(egw_cache::INSTANCE,'email', 'vacationNotice'+$icServer->acc_id);
+									$cachedVacations = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$GLOBALS['egw_info']['user']['account_lid']);
+									$cachedVacations = array($icServer->acc_id => $newVacation) + (array)$cachedVacations;
+									egw_cache::setCache(egw_cache::INSTANCE,'email', 'vacationNotice'+$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
+									
 									$msg = lang('Vacation notice sucessfully updated.');
 								}
 							}
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index ce8597ac44..1563d8f824 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -2284,32 +2284,25 @@ class mail_ui
 	/**
 	 * fetch vacation info from active Server using icServer object
 	 *
+	 * @param array $cachedVacations an array of cached vacations for an user
 	 * @return array|boolean array with vacation on success or false on failure
 	 */
-	function gatherVacation()
+	function gatherVacation($cachedVacations = array())
 	{
-		$vacation = $this->mail_bo->icServer->acc_sieve_enabled && ($this->mail_bo->icServer->acc_sieve_host||$this->mail_bo->icServer->acc_imap_host);
+		$isVacationEnabled = $this->mail_bo->icServer->acc_sieve_enabled && ($this->mail_bo->icServer->acc_sieve_host||$this->mail_bo->icServer->acc_imap_host);
 		//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation));
 
-		if ($vacation)
+		if ($isVacationEnabled)
 		{
 			$sieveServer = $this->mail_bo->icServer;
 			try
 			{
-				//Get vacation from cache if it's available
-				$vacationCached = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$sieveServer->acc_id);
+				$sieveServer->retrieveRules();
+				$vacation = $sieveServer->getVacation();
 				
-				if (!$vacationCached)
-				{
-					$sieveServer->retrieveRules();
-					$vacation = $sieveServer->getVacation();
-					// Set vacation to the instance cache for particular account
-					egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$sieveServer->acc_id, $vacation);
-				}
-				else
-				{
-					return $vacationCached;
-				}
+				$cachedVacations = array($sieveServer->acc_id => $vacation) + $cachedVacations;
+				// Set vacation to the instance cache for particular account with expiration of one day
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60*60*24);
 			} catch (PEAR_Exception $ex) {
 				$this->callWizard($ex->getMessage(), true, 'error');
 			}
@@ -3909,13 +3902,23 @@ class mail_ui
 	 *						if other than active profile; nothing is done!
 	 * @return nothing
 	 */
-	function ajax_refreshVacationNotice($icServerID=null)
+	public static function ajax_refreshVacationNotice($icServerID=null)
 	{
-		//error_log(__METHOD__.__LINE__.array2string($icServerId));
-		if (empty($icServerID)) $icServerID = $this->mail_bo->profileID;
-		if ($icServerID != $this->mail_bo->profileID) return;
-		$vacation = $this->gatherVacation();
-		//error_log(__METHOD__.__LINE__.array2string($vacation));
+		//Get vacation from cache if it's available
+		$cachedVacations = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$GLOBALS['egw_info']['user']['account_lid']);
+		$vacation = $cachedVacations[$icServerID];
+
+		if (!$vacation)
+		{
+			// Create mail app object
+			$mail = new mail_ui();
+			
+			if (empty($icServerID)) $icServerID = $mail->mail_bo->profileID;
+			if ($icServerID != $mail->mail_bo->profileID) return;
+			
+			$vacation = $mail->gatherVacation($cachedVacations);
+		}
+		
 		if($vacation) {
 			if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date'))
 			{

From e06b02f6f6b6d818ef6262d4c7cb67b0ea0ff1de Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 11 Aug 2014 12:44:33 +0000
Subject: [PATCH 57/94] Call ajax_refreshVacationNotice as a static method

---
 mail/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 927ac00376..c2c018b4b3 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -991,7 +991,7 @@ app.classes.mail = AppJS.extend(
 	 */
 	mail_callRefreshVacationNotice: function(_server)
 	{
-		egw.jsonq('mail.mail_ui.ajax_refreshVacationNotice',[_server]);
+		egw.jsonq('mail_ui::ajax_refreshVacationNotice',[_server]);
 	},
 	/**
 	 * Make sure attachments have all needed data, so they can be found for

From 217a2a8a112ca21b33b31b0eff002e04a787d59a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 Aug 2014 14:16:26 +0000
Subject: [PATCH 58/94] fix for invalid operand, if vacation cache is not yet
 initialised

---
 mail/inc/class.mail_ui.inc.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 1563d8f824..9b88e953fd 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -126,7 +126,7 @@ class mail_ui
 			$this->mail_bo = mail_bo::getInstance(true,self::$icServerID,$_validate=true, $_oldImapServerObject=false, $_reuseCache=true);
 			if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' Fetched IC Server:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 			//error_log(__METHOD__.__LINE__.array2string($this->mail_bo->icServer));
-			
+
 			// RegEx to minimize extra openConnection
 			$needle = '/mail.etemplate_widget_nextmatch.ajax_get_rows.etemplate|'
 //					. 'mail.mail_ui.ajax_refreshQuotaDisplay|'
@@ -176,7 +176,7 @@ class mail_ui
 			if ($_GET['menuaction'] == 'mail.mail_ui.index')
 			{
 				$response->call('framework.setSidebox','mail',array(),'md5');
-			}	
+			}
 			if ($exit)
 			{
 				common::egw_exit();
@@ -1458,7 +1458,7 @@ class mail_ui
 		{
 			list($app,$_profileID,$folderName) = explode(self::$delimiter,$_folderName,3);
 			unset($app);
-		}	
+		}
 		if (is_numeric($_profileID))
 		{
 			if ($_profileID && $_profileID != $this->mail_bo->profileID)
@@ -1502,7 +1502,7 @@ class mail_ui
 				if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]))
 				{
 					emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
-				}	
+				}
 			}
 			$filter = array(
 				'filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),
@@ -1584,7 +1584,7 @@ class mail_ui
 			//error_log(__METHOD__.__LINE__.' unlock tree ->'.$_GET['menuaction']);
 			$response->call('app.mail.unlock_tree');
 		}
-		
+
 		if (is_array($sR) && count($sR)>0)
 		{
 			foreach ((array)$sR as $key => $v)
@@ -2137,7 +2137,7 @@ class mail_ui
 				$attachmentHTML[$key]['partID']=$value['partID'];
 				$attachmentHTML[$key]['winmailFlag']=$value['is_winmail'];
 				$attachmentHTML[$key]['classSaveAllPossiblyDisabled'] = "mail_DisplayNone";
-				
+
 				switch(strtoupper($value['mimeType']))
 				{
 					case 'MESSAGE/RFC822':
@@ -2299,11 +2299,13 @@ class mail_ui
 			{
 				$sieveServer->retrieveRules();
 				$vacation = $sieveServer->getVacation();
-				
-				$cachedVacations = array($sieveServer->acc_id => $vacation) + $cachedVacations;
+
+				$cachedVacations = array($sieveServer->acc_id => $vacation) + (array)$cachedVacations;
 				// Set vacation to the instance cache for particular account with expiration of one day
 				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60*60*24);
-			} catch (PEAR_Exception $ex) {
+			}
+			catch (PEAR_Exception $ex)
+			{
 				$this->callWizard($ex->getMessage(), true, 'error');
 			}
 		}
@@ -3659,7 +3661,7 @@ class mail_ui
 						$nameSpace = $this->mail_bo->_getNameSpaces();
 						$prefix = $this->mail_bo->getFolderPrefixFromNamespace($nameSpace, $folderName);
 						//error_log(__METHOD__.__LINE__.'->'."$_folderName, $delimiter, $prefix");
-						
+
 						$subFolders = $this->mail_bo->getMailBoxesRecursive($folderName, $delimiter, $prefix);
 						foreach ($subFolders as $k => $folder)
 						{
@@ -3912,13 +3914,13 @@ class mail_ui
 		{
 			// Create mail app object
 			$mail = new mail_ui();
-			
+
 			if (empty($icServerID)) $icServerID = $mail->mail_bo->profileID;
 			if ($icServerID != $mail->mail_bo->profileID) return;
-			
+
 			$vacation = $mail->gatherVacation($cachedVacations);
 		}
-		
+
 		if($vacation) {
 			if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date'))
 			{

From 672297df94958e89e30020709f037320204e6380 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 11 Aug 2014 15:12:34 +0000
Subject: [PATCH 59/94] fix for somehow empty etemplate request content, giving
 an error when (or after) sending mail

---
 etemplate/inc/class.etemplate_widget_nextmatch.inc.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index 316ab7007a..43903cdf6c 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -277,6 +277,11 @@ class etemplate_widget_nextmatch extends etemplate_widget
 		array $knownUids=null, $lastModified=null)
 	{
 		self::$request = etemplate_request::read($exec_id);
+		// fix for somehow empty etemplate request content
+		if (!is_array(self::$request->content))
+		{
+			self::$request->content = array($form_name => array());
+		}
 		self::$response = egw_json_response::get();
 
 		$value = self::get_array(self::$request->content, $form_name, true);

From 82db8343bdcb539c237318a38a5842528c677e4f Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 11 Aug 2014 16:24:11 +0000
Subject: [PATCH 60/94] Some more speed improvements for initial load: - Avoid
 expensive connect in constructor for all AJAX calls (reconnect/cache used
 instead) - Don't verify that special folders exist for folder tree - Only
 fetch folder counts when fetchCounters flag is set, instead of always - Avoid
 some et2 warnings about not existing attributes (no speed improvement, but
 less annoying)

---
 mail/inc/class.mail_ui.inc.php   | 27 +++++++++++++--------------
 mail/templates/default/index.xet |  8 ++++----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 9b88e953fd..685385333c 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -132,7 +132,7 @@ class mail_ui
 //					. 'mail.mail_ui.ajax_refreshQuotaDisplay|'
 					. 'mail.mail_ui.ajax_changeProfile|'
 					. '^(?!mail)/';
-			if (!preg_match($needle,$_GET['menuaction']))
+			if (!preg_match($needle,$_GET['menuaction']) && !egw_json_request::isJSONRequest())
 			{
 				//error_log(__METHOD__.__LINE__.' Fetched IC Server openConnection:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 				//openConnection gathers SpecialUseFolderInformation and Delimiter Info
@@ -793,10 +793,10 @@ class mail_ui
 			$folderObjects = $this->mail_bo->getFolderObjects($_subscribedOnly,false,false,$_useCacheIfPossible);
 			//$endtime = microtime(true) - $starttime;
 			//error_log(__METHOD__.__LINE__.' Fetching folderObjects took: '.$endtime);
-			$trashFolder = $this->mail_bo->getTrashFolder();
-			$templateFolder = $this->mail_bo->getTemplateFolder();
-			$draftFolder = $this->mail_bo->getDraftFolder();
-			$sentFolder = $this->mail_bo->getSentFolder();
+			$trashFolder = $this->mail_bo->getTrashFolder(false);
+			$templateFolder = $this->mail_bo->getTemplateFolder(false);
+			$draftFolder = $this->mail_bo->getDraftFolder(false);
+			$sentFolder = $this->mail_bo->getSentFolder(false);
 			$userDefinedFunctionFolders = array();
 			if (isset($trashFolder) && $trashFolder != 'none') $userDefinedFunctionFolders['Trash'] = $trashFolder;
 			if (isset($sentFolder) && $sentFolder != 'none') $userDefinedFunctionFolders['Sent'] = $sentFolder;
@@ -881,11 +881,6 @@ class mail_ui
 			{
 				if ($levelCt>$cmblevelsCt+1) $fetchCounters=false;
 			}
-			//error_log(__METHOD__.__LINE__.' fc:'.$fetchCounters.'/'.$_fetchCounters.'('.$levelCt.'/'.$cmblevelsCt.')'.' for:'.array2string($key));
-			$fS = $this->mail_bo->getFolderStatus($key,false,($fetchCounters?false:true),false);
-			//error_log(__METHOD__.__LINE__.'Object:'.array2string($obj));
-			//error_log(__METHOD__.__LINE__.'Status:'.array2string($fS));
-			//error_log(__METHOD__.__LINE__."-------------------------");
 			$fFP = $folderParts = explode($obj->delimiter, $key);
 			if (in_array($key,$userDefinedFunctionFolders)) $obj->shortDisplayName = lang($obj->shortDisplayName);
 			//get rightmost folderpart
@@ -921,10 +916,14 @@ class mail_ui
 				$oA['im1'] = "folderOpen.gif";
 				$oA['im2'] = "MailFolderClosed.png"; // has Children
 			}
-			if ($fS['unseen'])
+			if ($fetchCounters)
 			{
-				$oA['text'] = $oA['text'].' ('.$fS['unseen'].')';
-				$oA['style'] = 'font-weight: bold';
+				$count = $this->mail_bo->getMailBoxCounters($key,true);
+				if($count->unseen)
+				{
+					$oA['text'] = $oA['text'].' ('.$count->unseen.')';
+					$oA['style'] = 'font-weight: bold';
+				}
 			}
 			$path = $this->mail_bo->profileID.self::$delimiter.$key;
 			$oA['id'] = $path; // ID holds the PATH
@@ -3918,7 +3917,7 @@ class mail_ui
 			if (empty($icServerID)) $icServerID = $mail->mail_bo->profileID;
 			if ($icServerID != $mail->mail_bo->profileID) return;
 
-			$vacation = $mail->gatherVacation($cachedVacations);
+			$vacation = $mail->gatherVacation();
 		}
 
 		if($vacation) {
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 007344fc8e..be2bbfe180 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -99,10 +99,10 @@
 								<description id="${row}[winmailFlag]" />
 								<description class="et2_link" id="${row}[filename]" no_lang="1" onclick="app.mail.displayAttachment"/>
 								<description align="right" id="${row}[size]" />
-								<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
-								<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
-								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
-								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
+								<buttononly id="${row}[save]" image="fileexport" onclick="app.mail.saveAttachment"/>
+								<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
+								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
+								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" image="mail/save_zip" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
 							</row>
 						</rows>
 					</grid>

From 91eabea2945acc7d0fc9c858bc753569a2d97ca8 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 11 Aug 2014 19:26:50 +0000
Subject: [PATCH 61/94] Some more speed improvements for get_rows: - Don't
 verify that special folders exist

---
 mail/inc/class.mail_ui.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 685385333c..b18d90d458 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1480,7 +1480,7 @@ class mail_ui
 		$toSchema = false;//decides to select list schema with column to selected (if false fromaddress is default)
 		if ($this->mail_bo->folderExists($_folderName))
 		{
-			$toSchema = $this->mail_bo->isDraftFolder($_folderName)||$this->mail_bo->isSentFolder($_folderName)||$this->mail_bo->isTemplateFolder($_folderName);
+			$toSchema = $this->mail_bo->isDraftFolder($_folderName,false)||$this->mail_bo->isSentFolder($_folderName,false)||$this->mail_bo->isTemplateFolder($_folderName,false);
 		}
 		else
 		{

From f7589316e0545866888e87780eb6589ab1b38c3f Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 11 Aug 2014 20:27:56 +0000
Subject: [PATCH 62/94] Make sure options are there before looking inside,
 avoids a potential error in filter options

---
 etemplate/js/et2_extension_nextmatch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index b66028f211..c36a35be33 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -2080,7 +2080,7 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
 		}
 
 		// Legacy: Add in 'All' option for cat_id, if not provided.
-		if(name == 'cat_id' && typeof options[''] == 'undefined' && typeof options[0] == 'undefined')
+		if(name == 'cat_id' && options != null && typeof options[''] == 'undefined' && typeof options[0] == 'undefined')
 		{
 			widget_options.empty_label = this.egw().lang('All');
 			this.egw().debug('warn', 'Nextmatch category filter had no "All" option.  Added, but you should fix that.');

From 0fa3ad831b45ab222fcb66e7e5c47236833e3ab3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 11 Aug 2014 22:50:38 +0000
Subject: [PATCH 63/94] Fix no longer working 'None' category option

---
 etemplate/inc/class.etemplate_widget_nextmatch.inc.php | 4 ++--
 timesheet/inc/class.timesheet_ui.inc.php               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index 43903cdf6c..b833379eff 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -181,10 +181,10 @@ class etemplate_widget_nextmatch extends etemplate_widget
 		if(!$value['no_cat'] && !$value['cat_is_select'])
 		{
 			$cat_app = $value['cat_app'] ? $value['cat_app'] : $GLOBALS['egw_info']['flags']['current_app'];
-			$value['options-cat_id'] = array();
+			$value['options-cat_id'] = self::$request->sel_options['cat_id'] ? self::$request->sel_options['cat_id'] : array();
 
 			// Add 'All', if not already there
-			if(!$value['options-cat_id'][''] && !($value['options-cat_id'][0] && $value['options-cat_id'][0]['value'] == ''))
+			if(!$value['options-cat_id'][''] && !$value['options-cat_id'][0])
 			{
 				$value['options-cat_id'][''] = lang('all');
 			}
diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index e9046a3be4..a37408061d 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -889,7 +889,7 @@ class timesheet_ui extends timesheet_bo
 		$sel_options = array(
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
-			'cat_id'     => array(lang('None')),
+			'cat_id'     => array(array('value' => '', 'label' => lang('all')), array('value' => 0, 'label'=>lang('None'))),
 			'ts_status'  => $this->status_labels+array(lang('No status')),
 		);
 		if($this->config_data['history'])

From cc04f0b89c338f2cdff92c451f8b7cf4fad70b15 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 11 Aug 2014 23:13:02 +0000
Subject: [PATCH 64/94] Create & use a flag 'no_actions' to disable actions for
 sum rows

---
 etemplate/js/et2_dataview_controller.js  | 28 ++++++++++++++----------
 timesheet/inc/class.timesheet_ui.inc.php |  4 ++++
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/etemplate/js/et2_dataview_controller.js b/etemplate/js/et2_dataview_controller.js
index 33b76cc85d..07fdbaf584 100644
--- a/etemplate/js/et2_dataview_controller.js
+++ b/etemplate/js/et2_dataview_controller.js
@@ -634,20 +634,24 @@ var et2_dataview_controller = Class.extend({
 
 			var links = null;
 
-			// Get the action links if the links callback is set
-			if (this.self._linkCallback)
+			// Look for a flag in the row to avoid actions.  Use for sums or extra header rows.
+			if(!_data.no_actions)
 			{
-				links = this.self._linkCallback.call(
-						this.self._context,
-						_data,
-						this.entry.idx,
-						this.entry.uid
-				);
-			}
+				// Get the action links if the links callback is set
+				if (this.self._linkCallback)
+				{
+					links = this.self._linkCallback.call(
+							this.self._context,
+							_data,
+							this.entry.idx,
+							this.entry.uid
+					);
+				}
 
-			// Register the row in the selection manager
-			this.self._selectionMgr.registerRow(this.entry.uid, this.entry.idx,
-					tr, links);
+				// Register the row in the selection manager
+				this.self._selectionMgr.registerRow(this.entry.uid, this.entry.idx,
+						tr, links);
+			}
 
 			// Invalidate the current row entry
 			this.entry.row.invalidate();
diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index a37408061d..fdc42afa0d 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -705,6 +705,10 @@ class timesheet_ui extends timesheet_bo
 
 				// Remove fake modified date, it breaks nextmatch checks
 				unset($row['ts_modified']);
+				
+				// Set flag to avoid actions on these rows
+				$row['no_actions'] = true;
+				
 				switch($row['ts_id'])
 				{
 					case 0:	// day-sum

From c60b7ae328073c1a058c2009935ea864ddfdf1c8 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 12 Aug 2014 08:23:54 +0000
Subject: [PATCH 65/94] Revert the change on ajax_refreshVacationNotice from
 commit 48039. Fix not keeping other vacations of an user in the cache

---
 mail/inc/class.mail_ui.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index b18d90d458..889c15089e 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -3917,7 +3917,7 @@ class mail_ui
 			if (empty($icServerID)) $icServerID = $mail->mail_bo->profileID;
 			if ($icServerID != $mail->mail_bo->profileID) return;
 
-			$vacation = $mail->gatherVacation();
+			$vacation = $mail->gatherVacation($cachedVacations);
 		}
 
 		if($vacation) {

From 5544c63b34ac8705a2768e9272cce039142554b3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 12 Aug 2014 12:39:21 +0000
Subject: [PATCH 66/94] pending translations from our translation server

---
 addressbook/lang/egw_en.lang |   2 -
 addressbook/lang/egw_nl.lang |  63 +++++++++++++-
 mail/lang/egw_nl.lang        | 157 +++++++++++++++++++++++++++++++++--
 3 files changed, 214 insertions(+), 8 deletions(-)

diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang
index 5b3da4a5dc..0efeecaf35 100644
--- a/addressbook/lang/egw_en.lang
+++ b/addressbook/lang/egw_en.lang
@@ -105,7 +105,6 @@ charset of file	addressbook	en	Charset of file
 check all	addressbook	en	Check all
 choose an icon for this contact type	admin	en	Choose an icon for this contact type
 choose charset	addressbook	en	Choose charset
-choose export options	addressbook	en	Choose export options
 choose owner of imported data	addressbook	en	Choose owner of imported data
 chosse an etemplate for this contact type	admin	en	Chose an eTemplate for this contact type
 city	common	en	City
@@ -461,7 +460,6 @@ type	addressbook	en	Type
 un-delete	addressbook	en	Un-delete
 unable to convert "%1" to account id.  using plugin setting (%2) for owner.	addressbook	en	Unable to convert "%1" to account ID.  Using plugin setting (%2) for owner.
 unable to delete	addressbook	en	unable to delete
-unable to import into %1, using %2	addressbook	en	Unable to import into %1, using %2
 unique id (uid)	addressbook	en	Unique ID (UID)
 unique id<br />(to update existing records)	addressbook	en	Unique ID<br />to update existing records
 update a single entry by passing the fields.	addressbook	en	Update a single entry by passing the fields.
diff --git a/addressbook/lang/egw_nl.lang b/addressbook/lang/egw_nl.lang
index fb2b3278a0..e9621491a2 100644
--- a/addressbook/lang/egw_nl.lang
+++ b/addressbook/lang/egw_nl.lang
@@ -1,7 +1,9 @@
 %1 added	addressbook	nl	%1 toegevoegd
 %1 contact(s) %2	addressbook	nl	%1 contact(en) %2
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	nl	%1 contact(en) %2, %3 mislukt vanwege onvoldoende rechten !!!
+%1 contacts updated (%2 errors).	addressbook	nl	%1 contacten bijgewerkt (%2 fouten)
 %1 fields in %2 other organisation member(s) changed	addressbook	nl	%1 velden in %2 andere organisatie lid/leden gewijzigd
+%1 not implemented for %2!	addressbook	nl	%1 niet geimplemnteerd voor %2!
 %1 records imported	addressbook	nl	%1 adressen geïmporteerd
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	nl	%1 adressen gelezen (nog niet geïmporteerd, U kunt %2terug%3 gaan en "Test Import" uitzetten)
 %1 starts with '%2'	addressbook	nl	%1 begint met '%2'
@@ -16,15 +18,21 @@ accounts	addressbook	nl	Accounts
 actions	addressbook	nl	Acties
 add %1	addressbook	nl	%1 toevoegen
 add a contact to this organisation	addressbook	nl	Voeg een contact toe aan deze organisatie
+add a customfield to link title	addressbook	nl	Voeg een zelf gedinieerd veld toe om titel te linken
 add a new contact	addressbook	nl	Voeg een contact toe
 add a new infolog	addressbook	nl	Voeg een nieuw Infolog record toe
 add a new list	addressbook	nl	Voeg een nieuwe lijst toe
 add a single entry by passing the fields.	addressbook	nl	Voeg een enkele invoer toe door door de velden te geven
+add appointment	addressbook	nl	Voeg een afspraak toe
 add business email of whole distribution list?	addressbook	nl	Voeg bedrijfsemail of hele distributielijst toe?
 add custom field	addressbook	nl	Aangepast veld toevoegen
 add emails of whole distribution list?	addressbook	nl	Voeg emailadressen van de hele distributie lijst toe?
 add or delete categories	addressbook	nl	Toevoegen of verwijderen categoriën
+add to bcc	addressbook	nl	Voeg aan BCc toe
+add to cc	addressbook	nl	Voeg aan CC toe
+add to distribution list	addressbook	nl	Voeg toe aan distributie lijst
 add to distribution list:	addressbook	nl	Voeg toe aan distributielijst:
+add to to	addressbook	nl	Voeg toe aan
 added	addressbook	nl	toegevoegd
 added by synchronisation	addressbook	nl	toegevoegd tijdens synchronisatie
 added to distribution list	addressbook	nl	toegevoegd aan distributielijst
@@ -33,17 +41,25 @@ address book	common	nl	Adresboek
 address book - vcard in	addressbook	nl	Adresboek - VCard in
 address book - view	addressbook	nl	Adresboek - weergave
 address line 2	addressbook	nl	Adresregel 2
+address line 2 (private)	addressbook	nl	Adresregel 2 (prive)
 address type	addressbook	nl	Adrestype
 addressbook	common	nl	Adresboek
 addressbook csv export	addressbook	nl	Adresboek CSV export
+addressbook csv import	addressbook	nl	Adresboek CSV import
+addressbook field	addressbook	nl	Adresboek veld
 addressbook menu	addressbook	nl	Adresboek menu
+addressbook of	addressbook	nl	Adresboek v an
 addressbook preferences	addressbook	nl	Adresboek voorkeuren
 addressbook the contact should be saved to	addressbook	nl	Adresboek waarin het contact opgeslagen moet worden
 addressbook the contact should be shown	addressbook	nl	Adresboek waarin de contact weergegeven moet worden
+addressbook vcard export	addressbook	nl	Adresboek vCard export
+addressbook vcard import	addressbook	nl	Adresboek vCard import
 addressbook-fieldname	addressbook	nl	Adresboek-veldnaam
 addvcard	addressbook	nl	VCard toevoegen
 advanced search	addressbook	nl	UItgebreid zoeken
 all contacts	addressbook	nl	Alle contacten
+all in one field	addressbook	nl	Alles im 1 veld
+allow members of following groups to edit contact-data of accounts	addressbook	nl	Sta alle leden van de volgende groepen toe alle contact data te wijzigen van accounts
 allow users to maintain their own account-data	admin	nl	Laat gebruikers toe hun eigen accountgegevens te beheren
 alt. csv import	addressbook	nl	Alternatief CSV-bestand importeren
 always	addressbook	nl	altijd
@@ -58,8 +74,10 @@ birthdays	common	nl	Verjaardagen
 blank	addressbook	nl	Blanco
 business	common	nl	Bedrijf
 business address	addressbook	nl	Adres bedrijf
+business address line 2	addressbook	nl	Adres bedrijf regel 2
 business city	addressbook	nl	Plaats Bedrijf
 business country	addressbook	nl	Land Bedrijf
+business country code	addressbook	nl	Land bedrijf code
 business email	addressbook	nl	Email Bedrijf
 business fax	addressbook	nl	Fax Bedrijf
 business phone	addressbook	nl	Telefoon Bedrijf
@@ -69,31 +87,40 @@ business zip code	addressbook	nl	Postcode Bedrijf
 calendar fields:	addressbook	nl	Kaldendervelden:
 calendar uri	addressbook	nl	Kalender URI
 can be changed via setup >> configuration	admin	nl	Kan gewijzigd worden via Setup >> Configuratie
+can't create dn %1	addressbook	nl	Kan dn %1 niet maken
 car phone	addressbook	nl	Autotelefoon
 categorie	addressbook	nl	categorie
 categorie added	addressbook	nl	categorie toegevoegd
 categorie delete	addressbook	nl	categorie verwijderd
 categories, notes, ...	addressbook	nl	Categorieën, notities, ...
+category path	addressbook	nl	Pad Categorie
 category tree	admin	nl	Categorie boom
 cell phone	addressbook	nl	Mobilofoon
 change all organisation members	addressbook	nl	wijzig alle  leden van de organisatie
 charset for the csv export	addressbook	nl	Karakterset voor de CSV export
+charset for the vcard export	addressbook	nl	Karakterset voor de vCard export
+charset for the vcard import and export	addressbook	nl	Karakterset voor de vCard im -en export
 charset of file	addressbook	nl	Karakterset van bestand
 check all	addressbook	nl	Markeer alles
 choose an icon for this contact type	admin	nl	Kies een pictogram voor dit  type contact
+choose charset	addressbook	nl	Kies karakterset
 choose owner of imported data	addressbook	nl	Kies de eigenaar van de geimporteerde gegevens
 chosse an etemplate for this contact type	admin	nl	Kies een eTemplate voor dit type contact
 city	common	nl	Stad
+city (private)	addressbook	nl	Stad (prive)
 company	common	nl	Bedrijf
 company name	addressbook	nl	Bedrijfsnaam
 configuration	common	nl	Instelling
 contact	common	nl	Contact
 contact application	admin	nl	Contactaanvraag
 contact copied	addressbook	nl	Contact gekopieerd
+contact data	addressbook	nl	Contactgegevens
 contact deleted	addressbook	nl	Contact verwijderd
 contact fields to show	addressbook	nl	Contactvelden die getoond moeten worden
 contact fields:	addressbook	nl	Contactvelden:
 contact id	addressbook	nl	Contact ID
+contact id cannot be changed by import	addressbook	nl	Contact ID kan niet worden gewijzigd bij import.
+contact maintenance	admin	nl	Contact onderhoud
 contact modified by %1 at %2	addressbook	nl	Contact is op %2 gewijzigd door %1
 contact not found!	addressbook	nl	Contact niet gevonden!
 contact repository	admin	nl	Contact databasegegevens
@@ -108,11 +135,17 @@ contains	addressbook	nl	bevat
 copied	addressbook	nl	gekopieerd
 copied by %1, from record #%2.	addressbook	nl	Gekopieerd door %1, van record #%2.
 copy a contact and edit the copy	addressbook	nl	Kopieer een contact en bewerk de kopie
+copy instead of move	addressbook	nl	Kopieer in plaats van verplaats
 copy your changes to the clipboard, %1reload the entry%2 and merge them.	addressbook	nl	Kopieer je wijzigingen naar het klembord, %1 herlaad het record %2 en voeg ze samen.
 country	common	nl	Land
+country (private)	addressbook	nl	Land (prive)
+country code	addressbook	nl	Land Code
+country code (private)	addressbook	nl	Land code (prive)
 create new links	addressbook	nl	Nieuwe links aanmaken
 created	addressbook	nl	Gecreëerd
 credit	addressbook	nl	Credit
+crm view list	addressbook	nl	CRM overzicht lijst
+crm-view	addressbook	nl	CRM-overzicht
 csv-fieldname	addressbook	nl	CSV-Veldnaam
 csv-filename	addressbook	nl	CSV-Bestandsnaam
 custom	addressbook	nl	Aangepast
@@ -120,6 +153,7 @@ custom etemplate for the contactform	addressbook	nl	Aangepaste eTemplate voor he
 custom fields	addressbook	nl	Aangepast velden
 debug output in browser	addressbook	nl	Debug resultaat in browser
 default	addressbook	nl	standaard
+default action on double-click	addressbook	nl	Standaard actie bij dubbel klikken
 default address format	addressbook	nl	Standaard adresformaat
 default addressbook for adding contacts	addressbook	nl	Standaardadresboek om contacten toe te voegen
 default document to insert contacts	addressbook	nl	Standaard document om contacten in te voegen
@@ -140,6 +174,8 @@ display contact	addressbook	nl	Contact weergeven
 displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	nl	Toont een herinnering voor verjaardagen op de voorpagina (de pagina die je te zien krijgt als je eGroupWare start of wanneer je op het voorpagina ikoon klikt)
 distribution list deleted	addressbook	nl	Distributielijst verwijderd
 distribution lists	addressbook	nl	Distributielijsten
+distribution lists, ...	addressbook	nl	Distributielijsten, ....
+do you really want to delete this contact?	addressbook	nl	Wilt u dit contact werkelijk verwijdenren ?
 do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?	addressbook	nl	Wil je een persoonlijk adresboek dat niet door andere gebruikers bekeken kan worden, jij verleent toegang tot je persoonlijke adresboek
 do your really want to delete this contact?	addressbook	nl	Wilt u dit contact werkelijk verwijderen?
 doesn't matter	addressbook	nl	maakt niets uit
@@ -149,10 +185,14 @@ download	addressbook	nl	Download
 download export file (uncheck to debug output in browser)	addressbook	nl	Download export bestand (uitzetten om in verkenner te tonen)
 download this contact as vcard file	addressbook	nl	dit contact als vCardbestand downloaden
 duration	addressbook	nl	Duur
+each category in its own field	addressbook	nl	Elke categorie in zijn eigen veld
+each option in its own field	addressbook	nl	Elke optie in zin eigen veld
+edit contact	addressbook	nl	Wijzig contact
 edit custom field	addressbook	nl	Aangepast veld wijzigen
 edit custom fields	admin	nl	Aangepaste velden wijzigen
 edit extra account-data in the addressbook	admin	nl	Extra account-gegevens in het adresboek wijzigen
-edit phonenumbers -	addressbook	nl	Telefoonnummers wijzigen
+edit phonenumbers	addressbook	nl	Telefoonnummers wijzigen
+edit phonenumbers -	addressbook	nl	Telefoonnummers wijzigen -
 either the configured email addesses are wrong or the mail configuration.	addressbook	nl	Of de ingestelde emailadressen zijn onjuist of de email configuratie is onjuist.
 email & internet	addressbook	nl	Email & Internet
 email addresses (comma separated) to send the contact data	addressbook	nl	Emailadressen (kommagescheiden) om de contactgegevens te verzenden
@@ -323,19 +363,27 @@ select the type of conversion	addressbook	nl	Kies type conversie
 select the type of conversion:	addressbook	nl	Kies type conversie:
 select where you want to store / retrieve contacts	admin	nl	Kies waar je contacten wilt opslaan / ophalen
 selected contacts	addressbook	nl	geselecteerde contacten
+send emailcopy to receiver	addressbook	nl	Zend een kopie mail naar ontvanger
+send succeeded to %1	common	nl	Zend verzenden gelukt naar %1
+seperator	addressbook	nl	Scheidingsteken
+set only full name	addressbook	nl	Geef alleen de volledig naam
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	nl	Moeten de kolommen foto en thuisadres altijd worden weergegeven, zelfs als ze leeg zijn?
 show	addressbook	nl	Toon
 show birthday reminders on main screen	addressbook	nl	Verjaardagsherinneringen weergeven op hoofdscherm
 show infolog entries for this organisation	addressbook	nl	InfoLog details van deze organisatie weergeven
 show the contacts of this organisation	addressbook	nl	Toon de contacten van deze organisatie
+similar contacts found:	addressbook	nl	Zelfde contacten gevonden:
 size of popup (wxh, eg.400x300, if a popup should be used)	admin	nl	Afmetingen van de popup (BxH, bijvoorbeeld 400x300, als een popup nodig is)
 start	admin	nl	Start
 startrecord	addressbook	nl	Startbestand
 state	common	nl	Provincie / Staat / Streek
+state (private)	addressbook	nl	Provincie (prive)
 street	common	nl	Straatnaam
+street (private)	addressbook	nl	Straat (prive)
 subject for email	addressbook	nl	Onderwerp voor het emailbericht
 successfully imported %1 records into your addressbook.	addressbook	nl	Met succes %1 record geïmporteerd naar uw adresboek
 suffix	addressbook	nl	Achtervoegsel
+tag to mark positions for address labels	addressbook	nl	Tag voor markering tbv adreslabels
 tel home	addressbook	nl	tel thuis
 telephony integration	admin	nl	Telefonie integratie
 test import (show importable records <u>only</u> in browser)	addressbook	nl	Test Import (te importeren adressen ALLEEN WEERGEVEN in uw browser)
@@ -344,27 +392,37 @@ that field name has been used already !	addressbook	nl	Het veldnaam is al in  ge
 the anonymous user has probably no add rights for this addressbook.	addressbook	nl	De anonieme gebruiker heeft waarschijnlijk geen toevoegrechten voor dit adresboek.
 the anonymous user needs add rights for it!	addressbook	nl	De anonieme gebruiker moet hier toevoegrechten voor hebben!
 the anonymous user needs read it!	addressbook	nl	De anonieme gebruiker moet hier leesrechten voor hebben!
+the following document-types are supported:	addressbook	nl	De volgende document types worden ondersteund :
 there was an error saving your data :-(	addressbook	nl	Er ontstond een fout tijdens het opslaan van uw gegevens :-(
 this module displays a contactform, that stores direct into the addressbook.	addressbook	nl	Deze module toont een contact formulier dat gegevens direct opslaat in het adresboek.
 this module displays block from a adddressbook group.	addressbook	nl	Deze module toont een blok van een adresboek groep.
 this person's first name was not in the address book.	addressbook	nl	De voornaam van deze persoon staat niet het adresboek.
 this person's last name was not in the address book.	addressbook	nl	De achternaam van deze persoon staat niet het adresboek.
 timezone	addressbook	nl	Tijdszone
+title	addressbook	nl	functie titel
 to many might exceed your execution-time-limit	addressbook	nl	Te veel kan mogelijk uw uitvoertijd van dit programme overschrijden
 today is %1's birthday!	common	nl	Vandaag is %1 jarig !
 tomorrow is %1's birthday.	common	nl	Morgen is %1 jarig
 translation	addressbook	nl	Vertaling
+two of: %1	addressbook	nl	Twee van: %1
 type	addressbook	nl	Type
+un-delete	addressbook	nl	Verwijderen ongedaan maken
+unable to delete	addressbook	nl	Niet mogelijk te verwijderen
+unique id (uid)	addressbook	nl	Uniek ID (UID)
 update a single entry by passing the fields.	addressbook	nl	Een record bijwerken door de velden te geven
 update fields by edited organisations?	admin	nl	Velden van de gewijzigde organisatie bijwerken?
 updated	addressbook	nl	Bijgewerkt
 upload or delete the photo	addressbook	nl	Upload of verwijder de foto
+url (business)	addressbook	nl	url (zakelijk)
+url (private)	addressbook	nl	url (prive)
 url to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)	admin	nl	URL waaraan telefoonnummers gelinkt moeten worden (gebruik %1 = nummer dat je wilt bellen, %u = account naam, %t = account telefoonnummer)
+use addressbooks "own sorting" attribute	addressbook	nl	Gebruik adresboek zijn "eigen sorteer" methode
 use an extra category tab?	addressbook	nl	Een extra categorie tabblad gebruiken?
 use an extra tab for private custom fields?	admin	nl	Een extra categorie tabblad gebruiken voor persoonlijke aangepaste velden?
 use country list	addressbook	nl	Gebruik Landenlijst
 use setup for a full account-migration	admin	nl	gebruik setup voor een volledige accountmigratie
 used for links and for the own sorting of the list	addressbook	nl	gebruikt voor links en voor eigen sortering van de lijst
+user preference	addressbook	nl	Gebrukers voorkeur
 vcard	common	nl	VCard
 vcards require a first name entry.	addressbook	nl	VCard vereist dat de voornaam ingevoerd is.
 vcards require a last name entry.	addressbook	nl	VCard vereist dat de achternaam ingevoerd is.
@@ -379,6 +437,7 @@ where to add the email address	addressbook	nl	waar moet het emailadres toegevoeg
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	nl	Welk adresformaat moet het adresboek gebruiken voor landen waarvan het adresformaat nog niet bekend is. Indien het adresformaat van een land bekend is wordt het ongeacht deze instelling gebruikt.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	nl	Welke adresboek moet geselecteerd worden wanneer een contact wordt bijgevoegd EN wanneer u geen toevoegingsrecht heb bij het huidige adresboek.
 which charset should be used for the csv export. the system default is the charset of this egroupware installation.	addressbook	nl	Welke karakterset moet gebruikt worden voor de CSV export. De systeem standaard is de karakterset van deze eGroupWare installatie.
+which charset should be used for the vcard export.	addressbook	nl	Welke karakterset moet gebruikt worden voor de vCard export
 which fields should be exported. all means every field stored in the addressbook incl. the custom fields. the business or home address only contains name, company and the selected address.	addressbook	nl	Welke velden moeten geexporteerd worden. "Alles" betekent elke veld dat in het adresboek is opgeslagen, inclusief de aangepaste velden. "Alleen bedrijf adres of privé adres" betekent dat alleen naam, organisatie en het gekozen adres wordt geexporteerd.
 whole query	addressbook	nl	gehele query
 work email if given, else home email	addressbook	nl	Zakelijke emailadres indien bekend, ander privé emailadres
@@ -390,6 +449,7 @@ yes, for the next two weeks	addressbook	nl	Ja, voor de volgende twee dagen
 yes, for the next week	addressbook	nl	Ja, voor de volgende week
 yes, for today and tomorrow	addressbook	nl	Ja, voor vandaag en morgen
 yes, only admins can purge deleted items	admin	nl	Ja, alleen beheerders kunnen gewiste items definitief verwijderen
+yes, users can purge their deleted items	admin	nl	Ja, gebruikers kunnen hun verwijderde items defintief verwijderen
 you are not permitted to delete contact %1	addressbook	nl	U bent niet bevoegd om contact %1 te verwijderen
 you are not permittet to delete this contact	addressbook	nl	U bent niet bevoegd om dit contact te verwijderen
 you are not permittet to edit this contact	addressbook	nl	U bent niet bevoegd om dit contact te wijzigen
@@ -401,4 +461,5 @@ you must select at least 1 column to display	addressbook	nl	U moet een op z'n mi
 you need to select a distribution list	addressbook	nl	U moet een distributielijst kiezen
 you need to select some contacts first	addressbook	nl	U moet eerst enkele contacten selecteren
 zip code	common	nl	Postcode
+zip code (private)	addressbook	nl	ZIP code (prive)
 zip_note	addressbook	nl	<p><b>Opmerking:</b> Het bestand mag een zip file zijn bestaande uit .csv, .vcf, of .ldif bestanden. Echter, geen meerdere types per import.
diff --git a/mail/lang/egw_nl.lang b/mail/lang/egw_nl.lang
index 983a07c5f8..f3decc0f47 100644
--- a/mail/lang/egw_nl.lang
+++ b/mail/lang/egw_nl.lang
@@ -1,31 +1,74 @@
+%1 attachments	mail	nl	Bijlage
 %1 is not writable by you!	mail	nl	%1 is NIET voor uw schrijfbaar
+(leave empty for no quota)	mail	nl	(laat leeg indien geen quota)
 (no subject)	mail	nl	(geen onderwerp)
+(not connected)	mail	nl	(nier verbonden)
+(select mails by clicking on the line, like a checkbox)	mail	nl	(selecteer berichten door op de
 (with checkbox enforced)	mail	nl	(met checkbox geforceerd)
+account editable by user	mail	nl	Accountdoor gebruiker te wijzigen
+action	mail	nl	Aktie
 activating by date requires a start- and end-date!	mail	nl	Activering op datum vereist een begin- EN einddatum!
+add a new folder to %1:	mail	nl	Voeg een neiuwe map toe %1
+add all my aliases	mail	nl	Voeg al mijn aliassen toe
+add folder	mail	nl	Voeg map toe
 add to addressbook	mail	nl	Aan adresboek toevoegen
+aliases+forwards	mail	nl	Aliases en Doorsturen
+all	mail	nl	Allemaal
+all adresses:	mail	nl	Alle adressen:
+all available info	admin	nl	Alle beschikbare informatie
+all filtered	mail	nl	Alle gefilterde
+all messages in the folder will be lost	mail	nl	Alle berichten in de map zullen verloren gaan
 all of	mail	nl	alles van
+allow external images	mail	nl	Sts externe afbeeldingen toe
 allow images from external sources in html emails	mail	nl	Afbeeldingen vanaf externe bronnen in HTML emails toestaan
+allow users to create further identities	mail	nl	Sta gebruikers toe meer identitietien aan te maken
 allways a new window	mail	nl	altijd in een nieuw venster
 always show html emails	mail	nl	Altijd HTML-emails weergeven
 any of	mail	nl	iedere van
 any status	mail	nl	iedere status
 attach users vcard at compose to every new mail	mail	nl	Sluit gebruikers Vcard bij, elke nieuwe mail
+attach vcard	mail	nl	Sluit vCard bij
+attachment	mail	nl	Bijlage
+attachments	mail	nl	Bijlagen
 available personal email-accounts/profiles	mail	nl	Beschikbare persoonlijke mail-postbussen/Profielen
 by date	mail	nl	op datum
+changed profile	mail	nl	Veranderd Profiel
+check message against next rule also	mail	nl	Controleer het bercicht ook met de volgende regel
+check to save as infolog on send	mail	nl	selecteer om ook als infolog te bewaren
+check to save as trackerentry on send	mail	nl	selecteer om ook als invoer voor tracker te bewaren
 compose	mail	nl	Schrijf nieuw bericht
 compress folder	mail	nl	Comprimeer map
+condition	mail	nl	Conditie
+configuration settings	mail	nl	Cnfiguratie instellinen
+confirm attach message	mail	nl	Bevestig toevoegen bericht
+confirm move to folder	mail	nl	Bevestig verplaats naar map
+connect to profile %1	mail	nl	Verbind naar profiel %1
 connection status	mail	nl	Status van de verbinding
 contains	mail	nl	bevat
+contains(*)	mail	nl	Bevat (*)
+create new account	mail	nl	Maak een nieuwe gebruiker aan
+currently:	mail	nl	Momenteel:
 date(newest first)	mail	nl	Datum (nieuwste eerst)
 date(oldest first)	mail	nl	Datum (oudste eerst)
+deactive	mail	nl	Niet actief
 default sorting order	mail	nl	Standaard volgorde
+default your name and email	common	nl	Standaard uw naam en email
+delete folder	mail	nl	Verwijder map
+delete folder %1 ?	mail	nl	VERWIJDER Map %1 ?
 deleted	mail	nl	verwijderd
+deleted %1 messages in %2	mail	nl	verwijder %1 berichten in %2
+deleted!	mail	nl	verwijderd!
+disable	mail	nl	Zet uit
+disabled!	mail	nl	Niet actief!
 discard	mail	nl	negeer
+discard message	mail	nl	Negeer bericht
 display messages in multiple windows	mail	nl	berichten in meerdere vensters weergeven
 display of html emails	mail	nl	Weergave van HTML-emails
+display of identities	admin	nl	Toon identiteiten
 display only when no plain text is available	mail	nl	Alleen weergeven als platte tekst niet beschikbaar is.
 displaying html messages is disabled	mail	nl	weergeven van html berichten is uitgeschakeld
 displaying plain messages is disabled	mail	nl	Weergeven standaard vericht is uitgeschakeld
+do not auto create folders	mail	nl	Maak niet automatisch mappen aan
 do you want to be asked for confirmation before moving selected messages to another folder?	mail	nl	Wilt u een bevestigingsvraag krijgen voordat de geselecteerde berichten naar een andere folder worden verplaatst?
 does not contain	mail	nl	bevat niet
 does not exist on imap server.	mail	nl	bestaat niet op IMAP server.
@@ -37,18 +80,42 @@ don't use template folder	mail	nl	Sjablonenfolder niet gebruiken
 don't use trash	mail	nl	'Prullenmand' niet gebruiken
 draft folder	mail	nl	conceptenfolder
 drafts	mail	nl	Concepten
-email notification update failed	mail	nl	email melding kon niet worden bijgewerkt
+drafts folder	mail	nl	Concept map
+edit account	mail	nl	Bewerk account
+edit account ...	mail	nl	Bewerk account ...
+edit folder acl	mail	nl	Bewerk map ACL
+edit folder acl ...	mail	nl	Bewerk map ACL ...
+edit vacation settings	mail	nl	Bewerk afwezigheid instellingen
+effective only if server supports acl at all	admin	nl	Werkt alleen als server ACL ondersteund
+email notification successfully updated!	mail	nl	Berichtnotificatie succesvol bijgewerkt
+email notification update failed	mail	nl	Bericht notificatiel  kon niet worden bijgewerkt
+email notification update failed! you need to set an email address!	mail	nl	Bericht notificatie bijwerken mislukt! U moet een email adres invoeren
 emailaddress	admin	nl	emailadres
+emailadmin: profilemanagement	mail	nl	eMailAdimin: Profiel management
 empty trash	mail	nl	Prullenmand legen
+enable	mail	nl	Activeer
+enabled!	mail	nl	Geactiveerd !
+enter the name for the new folder:	mail	nl	Voer de naam in voor de nieuwe map
 error saving %1!	mail	nl	Fout bij bewaren %1
 error:	mail	nl	Fout:
+error: could not save acl	mail	nl	Fout: Kon ACL niet bewaren
 error: could not save message as draft	mail	nl	Fout: Bericht kon niet worden opgeslagen als Concept
 error: could not save rule	mail	nl	Fout: Kon regel niet bewaren
 error: could not send message.	mail	nl	Fout: Kon bericht niet verzenden
 error: message could not be displayed.	mail	nl	Fout: Bericht kan niet worden getoond
+error:could not save the acl! because some names are empty!	mail	nl	Fout: Kan de ACL niet bewaren! Sommige namen zijn leeg !
+esync will fail without a working email configuration!	mail	nl	eSync zal NIET WERKEN zonder een eMail configuratie
 event details follow	mail	nl	Afspraak details volgen
-felamimail	admin	nl	FelaMiMail
+every:	mail	nl	Alle:
+everyone	mail	nl	Iedereen
+extended	mail	nl	Uitgebreid
+extra sent folders	mail	nl	Extra verzend mappen
+failed to delete %1 ! reason: %2	mail	nl	Mislukt om te verwijderen %1 ! Reden: %2
+failed to delete %1. server responded:	mail	nl	Mislukt om te verwijderen %1 ! Reactie Server:
+failed to move %1 ! reason: %2	mail	nl	Mislukt om te verplaatsen %1 ! Reden : %2
+failed to rename %1 ! reason: %2	mail	nl	Mislukt om te hernoemen %1 ! Reden : %2
 file into	mail	nl	bestand naar
+file into:	mail	nl	Bestand naar:
 file rejected, no %2. is:%1	mail	nl	Bestand geweigerd, geen %2.is:%1
 filemanager	mail	nl	Bestandsbeheer
 flagged	mail	nl	gemarkeerd
@@ -58,23 +125,49 @@ force html	mail	nl	Forceer HTML
 force plain text	mail	nl	Forceer platte tekst
 forward as attachment	mail	nl	doorsturen als bijlage
 forward inline	mail	nl	doorsturen in het bericht
+forward messages to:	mail	nl	Stuur berichten door aan:
+forward messages:	mail	nl	Suur bercihten door :
 forward to	mail	nl	doorsturen naar
+forward to address:	mail	nl	Stuur door aan adres
+forwards	mail	nl	Doorgestuurd
 from	mail	nl	Van
 from(a->z)	mail	nl	Van (A->Z)
 from(z->a)	mail	nl	Van (Z->A)
+general	admin	nl	Algemeen
+general settings	mail	nl	Algemene instellingen
 greater than	mail	nl	groter dan
+header	mail	nl	Kop
+hostname or ip	mail	nl	Hostnaam of IP
+how often to check with the server for new mail	mail	nl	Hoe vaak moet de server controleren op nieuwe mail
 how to forward messages	mail	nl	hoe berichten doorgestuurd moeten worden
 html	mail	nl	HTML
+html mode	mail	nl	HTML mode
+identity	mail	nl	Identiteit
+identity+signature	mail	nl	Identiteit+Handtekening
 if	mail	nl	ALS
+if authentication required	mail	nl	Als
+imap	mail	nl	IMAP
+imap - incoming mail	mail	nl	IMAP - inkomende berichten
+imap administration	mail	nl	IMAP administratie
 imap server	mail	nl	IMAP server
 importance	mail	nl	Belangrijk
 inbox	mail	nl	POSTVAK IN
 job	mail	nl	Taak
 junk	mail	nl	Junk
+junk folder	mail	nl	Junk map
+keep a copy of the message in your inbox	mail	nl	Bewaar een kopie van het bericht in uw inbox
+kilobytes	mail	nl	kilobytes
 later	mail	nl	later
 less than	mail	nl	minder dan
+mail	common	nl	Berichten
+mail filter	mail	nl	Berichten filter
 mail settings	mail	nl	Mail instellingen
+mail source	mail	nl	Berichten oorsporng
+mail-address	mail	nl	Bericht-adres
+mailaccount	mail	nl	Berichtaccount
+mailinglist	mail	nl	Berichtenlijst
 mark as deleted	mail	nl	Markeer als verwijderd
+match:	mail	nl	Komt overeen:
 matches	mail	nl	komt overeen met
 matches regexp	mail	nl	komt overeen met regexp
 move selected to	mail	nl	verplaats geselecteeerde
@@ -104,8 +197,15 @@ refresh time in minutes	mail	nl	Ververstijd in minuten
 reject with	mail	nl	weiger met
 remove all	mail	nl	Alles verwijderen
 remove immediately	mail	nl	Meteen verwijderen
+rename folder	mail	nl	Wijzig map naam
+rename folder %1 ?	mail	nl	Wijzigen naam map %1
+rename folder %1 to:	mail	nl	Naam map %1 wijzigen in :
 replied	mail	nl	gereageerd
-replyto	mail	nl	Reageer aan
+reply	mail	nl	Antwoord
+reply all	mail	nl	Antwoord aan Allen
+reply message type	mail	nl	Type antwoord bericht
+reply to	mail	nl	Antwoord aan
+replyto	mail	nl	Antwoord aan
 row order style	mail	nl	rijvolgorde stijl
 save all	mail	nl	Bewaar alle
 saving of message %1 succeeded. check folder %2.	mail	nl	Opslaan van bericht geslaagd %1.Controleer folder %2
@@ -113,6 +213,17 @@ selected	mail	nl	Geselecteerd
 sender	mail	nl	Afzender
 sent	mail	nl	Verzonden
 sent folder	mail	nl	Verzondenmap
+server supports special-use folders	mail	nl	Server ondersteund Speciaal gebruik mappen
+serverside filterrules (sieve) are not activated	mail	nl	Filter regels ISieve) zijn niet geactiveerd op de Server
+set / remove flags	mail	nl	Maak / Verwijder flags
+set / remove labels	mail	nl	Maak / Verwijder labels
+set it as default:	mail	nl	Maak dit standaard
+should new messages show up on the home page	mail	nl	Moeten neiuwe bercihten getoond worden op beginpagina
+show all folders	mail	nl	Toon alle mappen
+show new messages on home page	mail	nl	Toon nieuw bericht op begin pagina
+show test connection section and control the level of info displayed?	mail	nl	Toon test connectie en controleer het niveau van informatie wat wordt getoond ?
+show test connection section and control the level of info displayed??	mail	nl	Toon test connectie en controleer het niveau van informatie wat wordt getoond ??
+sieve	mail	nl	Sieve
 sieve connection status	mail	nl	Status Sieve connectie
 sieve script name	mail	nl	sieve script naam
 signature	mail	nl	Ondertekening
@@ -135,9 +246,45 @@ to do	mail	nl	te doen
 trash	mail	nl	Prullenbak
 trash folder	mail	nl	Prullenbak
 trying to recover from session data	mail	nl	probeer  vanaf sessie data te herstellen.
+unable to fetch vacation!	mail	nl	Niet mogelijk afwezigheidsbericht te laden.
+undelete	mail	nl	Verwijderen ongedaan maken
+unflagged	mail	nl	Niet gemarkeerd
 unread	mail	nl	ongelezen
-urgent	mail	nl	belangrijk
-vacation notice	admin	nl	afwezigheidsbericht
+unsubscribe folder	mail	nl	Niet geabonneerde map
+use default timeout (20 seconds)	mail	nl	Gebruik standaard timeout (20 seconden)
+use source as displayed, if applicable	mail	nl	Gebruik bron als getoond, wanneer van toepassing
+use username+password from current user	mail	nl	Gebruik gebruikersnaam en wachtwoord van de huidige gebruiker
+vacation notice	mail	nl	afwezigheidsbericht
+vacation notice is active	mail	nl	Afwezigheidbericht is niet geactiveerd
+vacation notice is not saved yet! (but we filled in some defaults to cover some of the above errors. please correct and check your settings and save again.)	mail	nl	Afwezigheidbericht is nog niet bewaard ( maar we hebben alle enige standaards ingevuld om de bovenstaande fouten te voorkomen. Corrigeer waar nodig, kijk uw ingave na en bewaar opnieuw.)
+vacation notice sucessfully updated.	mail	nl	Afwezigheid berciht bijwerken gelukt
+vacation notice update failed	mail	nl	Afwezigheid notificatie bijwerken mislukt
 vacation start-date must be before the end-date!	mail	nl	Afwezigheidbericht startdatum moet VOOR de einddatum liggen!
+vacation update failed	mail	nl	Afwezigheids bericht bijwerken mislukt
+valid for	mail	nl	Geldig voor
+validate addresses on submit:	mail	nl	Valideer adres bij toevoegen:
+validate selected addresses on submit:	mail	nl	Valideer geselcteerde adressen bij toevoegen:
+view full mail source	mail	nl	Bekijk de volledige bron van het bericht
+view header lines	mail	nl	Bekijk kopregels
+what do do with html email	mail	nl	Hoet html mail te behandelen
+what order the list columns are in	mail	nl	Welke volgorde is de lijstvan kolommen
+what to do when you delete a message	mail	nl	Wat te doen wanneer u een bericht verwijdert
+what to do when you send a message	mail	nl	Wat te doen wanneer u een bericht verzend
 when deleting messages	mail	nl	Bij het verwijderen van berichten
+when displaying messages in a popup, re-use the same popup for all or open a new popup for each message	mail	nl	Wanneer een bericht in een popup wordt getoond. gebruik dan dezelfde popup voor alle open berichten en voor elk bericht.
+when saving messages as item of a different app	mail	nl	Als berichten bewaard worden als item van een andere applicatie
+when sending messages	mail	nl	Wanneer berichten worden verzonden
+which folders (additional to the sent folder) should be displayed using the sent folder view schema	mail	nl	Welke mappen ( behalve de Verzenden map) moeten getoond worden bij gebruik van het schema van de verzend mappen
+which folders - in general - should not be automatically created, if not existing	mail	nl	Welke mappen - Algemeen - moeten niet automatisch aangemaakt worden als ze niet bestaan
+which method to use when forwarding a message	mail	nl	Welke methode gebruiken wanneer een berciht wordt doorgestuurd
+with message:	mail	nl	Met berciht:
+write	mail	nl	Schrijf
 wrote	mail	nl	schreef
+yes, but mask all passwords	mail	nl	Ja, maar bverberg alle wachtwoorden
+yes, but mask all usernames and passwords	mail	nl	Ja, maar verberg alle gebruikersnamen en wachtwoorden
+yes, offer copy option	mail	nl	Ja, stel kopieer functie voor
+yes, only trigger connection reset	mail	nl	Ja, geef alleen herinitialering verbinding aam
+yes, show all debug information available for the user	mail	nl	Ja, toon alle debug infromatie welke is beschikbaar voor de gebruiker
+yes, show basic info only	mail	nl	Ja, toon alleen basis infromatie
+you can either choose to save as infolog or tracker, not both.	mail	nl	U kunt kiezen om het bericht te bewaren als infolog of tracker maar niet allebei
+you've got new mail	mail	nl	Er is een nieuw bericht

From 694a63d1f457d83b91c27cf38be83244cf031d9f Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 12 Aug 2014 16:58:07 +0000
Subject: [PATCH 67/94] Indicate merge class to use for mail, fixes infolog
 placeholders not known

---
 etemplate/inc/class.bo_merge.inc.php | 3 ++-
 mail/inc/class.mail_compose.inc.php  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index d55b083c68..ee84a7ce0a 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -1831,7 +1831,7 @@ abstract class bo_merge
 	private static function document_mail_action(Array &$action, $file)
 	{
 		unset($action['postSubmit']);
-
+		
 		// Lots takes a while, confirm
 		$action['confirm_multiple'] = lang('Do you want to send the message to all selected entries, WITHOUT further editing?');
 
@@ -1839,6 +1839,7 @@ abstract class bo_merge
 		$extra = array(
 			'from=merge',
 			'document='.$file['path'],
+			'merge='.get_called_class()
 		);
 
 		// egw.open() used if only 1 row selected
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 725a445be5..d212e9c615 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1397,7 +1397,9 @@ class mail_compose
 			 * Use ajax_merge to merge & send multiple
 			 */
 			// Merge selected ID (in mailtocontactbyid or $mail_id) into given document
-			$document_merge = new addressbook_merge();
+			preg_match('/^([a-z_-]+_merge)$/', $_REQUEST['merge'], $merge_class);
+			$merge_class = $merge_class[1] ? $merge_class[1] : 'addressbook_merge';
+			$document_merge = new $merge_class();
 			$this->mail_bo->openConnection();
 			$merge_ids = $_REQUEST['preset']['mailtocontactbyid'] ? $_REQUEST['preset']['mailtocontactbyid'] : $mail_id;
 			$merge_ids = is_array($merge_ids) ? $merge_ids : explode(',',$merge_ids);

From 251a4cd25e79ab810bce2ef99ca2750154823ed1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 12 Aug 2014 17:01:22 +0000
Subject: [PATCH 68/94] profiling script for mail

---
 mail/profile.php | 150 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 mail/profile.php

diff --git a/mail/profile.php b/mail/profile.php
new file mode 100644
index 0000000000..8e4b84eeda
--- /dev/null
+++ b/mail/profile.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Profiling of diverse mail functions
+ *
+ * For Apache FCGI you need the following rewrite rule:
+ *
+ * 	RewriteEngine on
+ * 	RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
+ *
+ * Otherwise authentication request will be send over and over again, as password is NOT available to PHP!
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package mail
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2014 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @version $Id$
+ */
+
+$starttime = microtime(true);
+
+$GLOBALS['egw_info'] = array(
+	'flags' => array(
+		'disable_Template_class' => True,
+		'noheader'  => True,
+		'currentapp' => 'mail',
+		'autocreate_session_callback' => 'egw_digest_auth::autocreate_session_callback',
+		'auth_realm' => 'EGroupware mail profile',
+	)
+);
+//require_once('../phpgwapi/inc/class.egw_digest_auth.inc.php');
+include(dirname(__DIR__).'/header.inc.php');
+
+$headertime = microtime(true);
+
+// on which mail account do we work, if not specified use default one (connects to imap server!)
+$acc_id = isset($_GET['acc_id']) && (int)$_GET['acc_id'] > 0 ? (int)$_GET['acc_id'] : emailadmin_account::get_default_acc_id();
+// calling emailadmin_account::read with explicit account_id to not cache object for current user!
+$account = emailadmin_account::read($acc_id, $GLOBALS['egw_info']['user']['account_id']);
+
+$accounttime = microtime(true);
+
+$times = array(
+	'header' => $headertime - $starttime,
+	'acc_id' => $acc_id,
+	'account' => (string)$account,
+	'read' => $accounttime - $headertime,
+);
+
+horde_times($account, $times);
+mail_times($acc_id, $times);
+
+Header('Content-Type: application/json; charset=utf-8');
+echo json_encode($times, JSON_PRETTY_PRINT);
+
+function mail_times($acc_id, array &$times, $prefix='mail_')
+{
+	$starttime = microtime(true);
+	// instanciate mail for given acc_id - have to set it as preference ;-)
+	$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $acc_id;
+	// instanciation should call openConnection
+	$mail_ui = new mail_ui();
+	$mail_ui->mail_bo->openConnection($acc_id);
+	$logintime = microtime(true);
+
+	// fetch mailboxes
+	$mboxes = $mail_ui->getFolderTree();
+	$listmailboxestime = microtime(true);
+
+	// get first 20 mails
+	$query = array(
+		'start' => 0,
+		'num_rows' => 20,
+		'filter' => 'any',
+		'filter2' => 'quick',
+		'search' => '',
+		'order' => 'date',
+		'sort' => 'DESC',
+	);
+	$rows = $readonlys = array();
+	$mail_ui->get_rows($query, $rows, $readonlys);
+	$fetchtime = microtime(true);
+
+	$times += array(
+		$prefix.'login' => $logintime - $starttime,
+		$prefix.'listmailboxes' => $listmailboxestime - $logintime,
+		$prefix.'fetch' => $fetchtime - $listmailboxestime,
+		$prefix.'total' => $fetchtime - $starttime,
+		//$prefix.'mboxes' => $mboxes,
+	);
+	unset($mboxes);
+	$mail_ui->mail_bo->icServer->close();
+	$mail_ui->mail_bo->icServer->logout();
+}
+
+function horde_times(emailadmin_account $account, array &$times, $prefix='horde_')
+{
+	$starttime = microtime(true);
+	$imap = $account->imapServer();
+
+	// connect to imap server
+	$imap->login();
+	$logintime = microtime(true);
+
+	// list all subscribed mailboxes incl. attributes and children
+	$mboxes = $imap->listMailboxes('*', Horde_Imap_Client::MBOX_SUBSCRIBED, array(
+		'attributes' => true,
+		'children' => true,
+	));
+	$listmailboxestime = microtime(true);
+
+	// fetch 20 newest mails
+	horde_fetch($imap);
+	$fetchtime = microtime(true);
+
+	$times += array(
+		$prefix.'login' => $logintime - $starttime,
+		$prefix.'listmailboxes' => $listmailboxestime - $logintime,
+		$prefix.'fetch' => $fetchtime - $listmailboxestime,
+		$prefix.'total' => $fetchtime - $starttime,
+		//$prefix.'mboxes' => $mboxes,
+	);
+	unset($mboxes);
+	$imap->close();
+	$imap->logout();
+}
+
+function horde_fetch(Horde_Imap_Client_Socket $client, $mailbox='INBOX')
+{
+	$squery = new Horde_Imap_Client_Search_Query();
+	// using a date filter to limit returned uids, gives huge speed improvement on big mailboxes, because less uids returned
+	//$squery->dateSearch(new DateTime('-30days'), Horde_Imap_Client_Search_Query::DATE_SINCE, false, false);
+	$squery->flag('DELETED', $set=false);
+	$sorted = $client->search($mailbox, $squery, array(
+		'sort' => array(Horde_Imap_Client::SORT_REVERSE, Horde_Imap_Client::SORT_SEQUENCE),
+	));
+
+	$first20uids = new Horde_Imap_Client_Ids();
+	$first20uids->add(array_slice($sorted['match']->ids, 0, 20));
+
+	$fquery = new Horde_Imap_Client_Fetch_Query();
+	$fquery->headers('headers', array('Subject', 'From', 'To', 'Cc', 'Date'), array('peek' => true,'cache' => true));
+	$fquery->structure();
+	$fquery->flags();
+	$fquery->imapDate();
+
+	return $client->fetch($mailbox, $fquery, array(
+		'ids' => $first20uids,
+	));
+}

From 4944b1a1fb9ca0fd291a4b4b46c8366f2d6975b5 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 12 Aug 2014 17:48:47 +0000
Subject: [PATCH 69/94] Fix double encoded & in merge functions

---
 etemplate/inc/class.bo_merge.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index ee84a7ce0a..16419e7bc2 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -1381,7 +1381,7 @@ abstract class bo_merge
 					$LF = "\n";
 			}
 		if($is_xml) {
-			$this->replacements = str_replace(array('&','<','>',"\r","\n"),array('&amp;','&lt;','&gt;','',$LF),$this->replacements);
+			$this->replacements = str_replace(array('&','&amp;amp;','<','>',"\r","\n"),array('&amp;','&amp;','&lt;','&gt;','',$LF),$this->replacements);
 		}
 		if (strpos($param[0],'$$NELF') === 0)
 		{	//sets a Pagebreak and value, only if the field has a value

From deeebeb77fcf3a703f202eb4b4ddf4fc59a7fe4b Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 12 Aug 2014 19:06:58 +0000
Subject: [PATCH 70/94] Directly delete any trash cache when trash is emptied

---
 mail/js/app.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mail/js/app.js b/mail/js/app.js
index c2c018b4b3..931c50f579 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1546,6 +1546,22 @@ app.classes.mail = AppJS.extend(
 		this.egw.message(this.egw.lang('empty trash'));
 		egw.json('mail.mail_ui.ajax_emptyTrash',[server[0], activeFilters['selectedFolder']? activeFilters['selectedFolder']:null],function(){self.unlock_tree()})
 			.sendRequest(true);
+
+		// Directly delete any trash cache for selected server
+		if(window.localStorage)
+		{
+			for(var i = 0; i < window.localStorage.length; i++)
+			{
+				var key = window.localStorage.key(i);
+
+				// Find directly by what the key would look like
+				if(key.indexOf('cached_fetch_mail::{"selectedFolder":"'+server[0]+'::') == 0 &&
+					key.toLowerCase().indexOf(egw.lang('trash').toLowerCase()) > 0)
+				{
+					window.localStorage.removeItem(key);
+				}
+			}
+		}
 	},
 
 	/**

From f6bca11f4fd9dc6c6a3e15a586ff7a51140a6443 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 12 Aug 2014 23:19:39 +0000
Subject: [PATCH 71/94] Add an additional format to parse times in the
 formatY-m-dTH:m:s for insertion into spreadsheets, fixes warning when merge
 printing "Unable to parse date ... left as text"

---
 etemplate/inc/class.bo_merge.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 16419e7bc2..263a01c8b5 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -1133,6 +1133,7 @@ abstract class bo_merge
 		// Some different formats dates could be in, depending what they've been through
 		$formats = array(
 			'!'.egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat.':s',
+			'!'.egw_time::$user_dateformat . '*' .egw_time::$user_timeformat.':s',
 			'!'.egw_time::$user_dateformat . '* ' .egw_time::$user_timeformat,
 			'!'.egw_time::$user_dateformat . '*',
 			'!'.egw_time::$user_dateformat,

From 1f35ccea1fbb74d0c570f9e1642f1ff280e3e628 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 13 Aug 2014 07:14:46 +0000
Subject: [PATCH 72/94] allow to switch caching in Horde_Imap_Client off
 globally via unset(emailadmin_imap::$default_params["cache"]); and do that by
 default for profiling

---
 mail/profile.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mail/profile.php b/mail/profile.php
index 8e4b84eeda..2da669ef24 100644
--- a/mail/profile.php
+++ b/mail/profile.php
@@ -38,12 +38,18 @@ $acc_id = isset($_GET['acc_id']) && (int)$_GET['acc_id'] > 0 ? (int)$_GET['acc_i
 // calling emailadmin_account::read with explicit account_id to not cache object for current user!
 $account = emailadmin_account::read($acc_id, $GLOBALS['egw_info']['user']['account_id']);
 
+// switching off caching by default
+// if caching is enabled mail_times will always provit from previous running horde_times!
+$cache = isset($_GET['cache']) && $_GET['cache'];
+if (!$cache) unset(emailadmin_imap::$default_params['cache']);
+
 $accounttime = microtime(true);
 
 $times = array(
 	'header' => $headertime - $starttime,
 	'acc_id' => $acc_id,
 	'account' => (string)$account,
+	'cache' => $cache,
 	'read' => $accounttime - $headertime,
 );
 
@@ -55,6 +61,7 @@ echo json_encode($times, JSON_PRETTY_PRINT);
 
 function mail_times($acc_id, array &$times, $prefix='mail_')
 {
+	global $cache;
 	$starttime = microtime(true);
 	// instanciate mail for given acc_id - have to set it as preference ;-)
 	$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] = $acc_id;
@@ -64,7 +71,8 @@ function mail_times($acc_id, array &$times, $prefix='mail_')
 	$logintime = microtime(true);
 
 	// fetch mailboxes
-	$mboxes = $mail_ui->getFolderTree();
+	$mboxes = $mail_ui->getFolderTree(/*$_fetchCounters=*/false, null, /*$_subscribedOnly=*/true,
+		/*$_returnNodeOnly=*/true, $cache, /*$_popWizard=*/false);
 	$listmailboxestime = microtime(true);
 
 	// get first 20 mails

From 589d2c9dae95f01cb67a96323ca2680b5e6e0c76 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 13 Aug 2014 11:45:55 +0000
Subject: [PATCH 73/94] * Mail: keyword actions were not always displayed (eg.
 never for Dovecot and GMail)

---
 mail/inc/class.mail_ui.inc.php | 28 ++++++++++++++++++----------
 mail/js/app.js                 | 12 ++++++------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 889c15089e..9ed4e3118a 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1327,6 +1327,9 @@ class mail_ui
 							'caption' => 'Set / Remove Labels',
 							'icon' => 'tag_message',
 							'group' => ++$group,
+							// note this one is NOT a real CAPABILITY reported by the server, but added by selectMailbox
+							'enabled' => $this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'),
+							'hideOnDisabled' => true,
 							'children' => array(
 								'unlabel' => array(
 									'group' => ++$group,
@@ -1422,12 +1425,6 @@ class mail_ui
 		{
 			unset($actions['tracker']);
 		}
-		// note this one is NOT a real CAPABILITY reported by the server, but added by selectMailbox
-		if (!$this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
-		{
-			unset($actions['mark']['children']['setLabel']);
-			unset($actions['mark']['children']['unsetLabel']);
-		}
 		return $actions;
 	}
 
@@ -1438,9 +1435,9 @@ class mail_ui
 	 * @param array &$rows
 	 * @param array &$readonlys
 	 */
-	function get_rows($query,&$rows,&$readonlys)
+	function get_rows(&$query,&$rows,&$readonlys)
 	{
-		unset($query['actions']);
+//		unset($query['actions']);
 		//error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows'].array2string($query['order']).'->'.array2string($query['sort']));
 		if (mail_bo::$debugTimes) $starttime = microtime(true);
 		//$query['search'] is the phrase in the searchbox
@@ -1466,6 +1463,7 @@ class mail_ui
 				try
 				{
 					$this->changeProfile($_profileID);
+					$query['actions'] = $this->get_actions();
 				}
 				catch(Exception $e)
 				{
@@ -2037,7 +2035,6 @@ class mail_ui
 		$actionsenabled = self::get_actions();
 		unset($actionsenabled['open']);
 		unset($actionsenabled['mark']['children']['setLabel']);
-		unset($actionsenabled['mark']['children']['unsetLabel']);
 		unset($actionsenabled['mark']['children']['read']);
 		unset($actionsenabled['mark']['children']['unread']);
 		unset($actionsenabled['mark']['children']['undelete']);
@@ -3868,7 +3865,7 @@ class mail_ui
 	 * @param bool $getFolders The client needs the folders for the profile
 	 * @return nothing
 	 */
-	function ajax_changeProfile($icServerID, $getFolders = true)
+	function ajax_changeProfile($icServerID, $getFolders = true, $exec_id=null)
 	{
 		$response = egw_json_response::get();
 
@@ -3876,7 +3873,18 @@ class mail_ui
 		{
 			try
 			{
+				if ($exec_id) $old_actions = $this->get_actions();
 				$this->changeProfile($icServerID);
+				// if we have an eTemplate exec_id, also send changed actions
+				if ($exec_id && ($actions = $this->get_actions()) != $old_actions)
+				{
+					$response->generic('assign', array(
+						'etemplate_exec_id' => $exec_id,
+						'id' => 'nm',
+						'key' => 'actions',
+						'value' => $actions,
+					));
+				}
 			}
 			catch (Exception $e) {
 				self::callWizard($e->getMessage(),true, 'error');
diff --git a/mail/js/app.js b/mail/js/app.js
index 931c50f579..224293e484 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -97,7 +97,7 @@ app.classes.mail = AppJS.extend(
 				$j(nm).off('refresh');
 			}
 		}
-		
+
 		// Unregister client side cache
 		this.egw.dataCacheUnregister('mail');
 
@@ -1542,7 +1542,7 @@ app.classes.mail = AppJS.extend(
 		var server = _senders[0].iface.id.split('::');
 		var activeFilters = this.mail_getActiveFilters();
 		var self = this;
-		
+
 		this.egw.message(this.egw.lang('empty trash'));
 		egw.json('mail.mail_ui.ajax_emptyTrash',[server[0], activeFilters['selectedFolder']? activeFilters['selectedFolder']:null],function(){self.unlock_tree()})
 			.sendRequest(true);
@@ -1598,7 +1598,7 @@ app.classes.mail = AppJS.extend(
 		this.egw.message(this.egw.lang('Connect to Profile %1',_widget.getSelectedLabel().replace(this._unseen_regexp, '')));
 
 		this.lock_tree();
-		egw.json('mail.mail_ui.ajax_changeProfile',[folder, getFolders], jQuery.proxy(function() {
+		egw.json('mail.mail_ui.ajax_changeProfile',[folder, getFolders, this.et2._inst.etemplate_exec_id], jQuery.proxy(function() {
 			// Profile changed, select inbox
 			var inbox = folder + '::INBOX';
 			_widget.reSelectItem(inbox);
@@ -3075,12 +3075,12 @@ app.classes.mail = AppJS.extend(
 		if (addr)
 		{
 			tmp = aliases.concat(addr.get_value());
-			
+
 			// returns de-duplicate items of an array
 			var deDuplicator = function (item,pos){
-									return tmp.indexOf(item) == pos	
+									return tmp.indexOf(item) == pos
 			};
-			
+
 			aliases = tmp.filter(deDuplicator);
 			addr.set_value(aliases);
 		}

From bcedbb950e4e6759e0491d88e04802e40c743ef7 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 13 Aug 2014 12:55:28 +0000
Subject: [PATCH 74/94] Fix switching between HTML/PLAIN is not working on mail
 compose

---
 mail/js/app.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 224293e484..3dae9ee21e 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3012,14 +3012,22 @@ app.classes.mail = AppJS.extend(
 	*
 	* @param {egw object} _egw
 	* @param {widget object} _widget
-	* @param {window object} _window
 	*/
-	submitOnChange: function(_egw, _widget, _window) {
+	submitOnChange: function(_egw, _widget)
+	{
 		if (!jQuery.isEmptyObject(_widget))
 		{
-			if (!jQuery.isEmptyObject(_widget.getValue()))
+			if (typeof _widget.id !== 'undefined') var widgetId = _widget.id;
+			switch (widgetId)
 			{
-				this.et2_obj.submit();
+				case 'mimeType':
+					this.et2_obj.submit();
+					break;
+				default:
+					if (!jQuery.isEmptyObject(_widget.getValue()))
+					{
+						this.et2_obj.submit();
+					}
 			}
 		}
 	},

From 438c308ad02b0fd5242f85b3a04d565ce75883f1 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 13 Aug 2014 17:32:04 +0000
Subject: [PATCH 75/94] Fix bugs in import - typo prevented conditions from
 being evaluated - Groups in the form <name> Group were not parsed

---
 .../inc/class.importexport_basic_import_csv.inc.php |  4 ++--
 .../inc/class.importexport_helper_functions.inc.php | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/importexport/inc/class.importexport_basic_import_csv.inc.php b/importexport/inc/class.importexport_basic_import_csv.inc.php
index 28f7943556..5fae9d9aa5 100644
--- a/importexport/inc/class.importexport_basic_import_csv.inc.php
+++ b/importexport/inc/class.importexport_basic_import_csv.inc.php
@@ -224,8 +224,8 @@ abstract class importexport_basic_import_csv implements importexport_iface_impor
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
-		if ( $this->_definition->plugin_options['conditions'] ) {
-			foreach ( $this->_definition->plugin_options['conditions'] as $condition ) {
+		if ( $this->definition->plugin_options['conditions'] ) {
+			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
 				$result = false;
 				switch ( $condition['type'] ) {
 					// exists
diff --git a/importexport/inc/class.importexport_helper_functions.inc.php b/importexport/inc/class.importexport_helper_functions.inc.php
index 9ec38ce737..3ed3a1eebe 100755
--- a/importexport/inc/class.importexport_helper_functions.inc.php
+++ b/importexport/inc/class.importexport_helper_functions.inc.php
@@ -155,12 +155,19 @@ class importexport_helper_functions {
 				$skip = true; // Skip the next one, it's the first name
 				continue ;
 			}
+
+			// Deal with groups listed as <name> Group, remove the Group
+			if(substr(trim($account_lid),-strlen(lang('Group'))) == lang('Group'))
+			{
+				$account_lid = trim(substr(trim($account_lid), 0, -strlen(lang('Group'))));
+			}
+
 			if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid )) {
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
 			}
-			if ( $account_id = $GLOBALS['egw']->accounts->name2id( $account_lid, 'account_fullname' )) {
+			if ( $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid), 'account_fullname' )) {
 				$account_ids[] = $account_id;
 				unset($account_lids[$key]);
 				continue;
@@ -174,7 +181,7 @@ class importexport_helper_functions {
 				continue;
 			}
 			// Group, <name> - remove the Group part
-			if($account_lid == 'Group')
+			if($account_lid == lang('Group'))
 			{
 				unset($account_lids[$key]);
 				continue;
@@ -494,7 +501,7 @@ class importexport_helper_functions {
 	public static function load_defaults($appname) {
 		// Check for new definitions to import from $appname/setup/*.xml
 		$appdir = EGW_INCLUDE_ROOT. "/$appname/setup";
-		if(!is_dir($appdir)) continue;
+		if(!is_dir($appdir)) return;
 		$d = dir($appdir);
 
 		// step through each file in app's setup

From a3a6e92bf197aaa73bff4f09cb7b382b7ffaab5a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 Aug 2014 05:57:08 +0000
Subject: [PATCH 76/94] copy 14.1 changelog to trunk to satisfy update checker

---
 doc/rpm-build/debian.changes | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/rpm-build/debian.changes b/doc/rpm-build/debian.changes
index 2878e5c2ec..a6d5299c11 100644
--- a/doc/rpm-build/debian.changes
+++ b/doc/rpm-build/debian.changes
@@ -1,3 +1,20 @@
+egroupware-epl (14.1.20140812-1) hardy; urgency=low
+
+  * EMailAdmin/Mail: fix to work with Horde_Imap_Client 2.24.1+ (Tried to access unknown attribute "capability"!)
+  * Mail: performance improvements and bug fixes
+  * Mail: add all aliases to vacation message
+  * Addressbook: next/previous button in CRM view was not working
+  * Filemanager: fixed delete button for extended ACL
+  * Addressbook/Mail: Dutch translations from our translation server
+
+ -- Ralf Becker <rb@stylite.de>  Tue, 12 Aug 2014 14:42:56 +0200
+
+egroupware-epl (14.1.20140731-1) hardy; urgency=low
+
+  * Mail: handle broken filenames (non utf8) in attachments
+
+ -- Ralf Becker <rb@stylite.de>  Thu, 31 Jul 2014 15:57:50 +0200
+
 egroupware-epl (14.1.20140725-1) hardy; urgency=low
 
   * Admin: restore backups from admin was not working (worked only from setup)

From 176c1247dc3d7640ea1048257413685f175f9016 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 14 Aug 2014 11:28:55 +0000
Subject: [PATCH 77/94] Refresh Trash folder folder-status when empty Trash
 action is triggered not from the Trash folder

---
 mail/inc/class.mail_ui.inc.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 9ed4e3118a..71ecc45ed4 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -4059,6 +4059,15 @@ class mail_ui
 				$response->call('app.mail.lock_tree');
 			}
 			$this->mail_bo->compressFolder($trashFolder);
+			
+			$heirarchyDelimeter = $this->mail_bo->getHierarchyDelimiter(true);
+			$fShortName =  array_pop(explode($heirarchyDelimeter, $trashFolder));
+			$fStatus = array(
+				$icServerID.self::$delimiter.$trashFolder => $fShortName
+			);
+			//Call to reset folder status counter, after emptyTrash triggered not from Trash folder
+			//-as we don't have trash folder specific information available on client-side we need to deal with it on server
+			$response->call('app.mail.mail_setFolderStatus',$fStatus);
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
 		{

From 2df89703ca75b50c2b0ed1d7a458a4cdb3660b94 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 14 Aug 2014 13:49:14 +0000
Subject: [PATCH 78/94] * Mail: fix problem on not applied but possibly set
 status filter on all message actions for flagging

---
 mail/inc/class.mail_ui.inc.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 71ecc45ed4..100a581e6e 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -4212,13 +4212,13 @@ class mail_ui
 						if (count($messageListForToggle)>0)
 						{
 							$flag2set = (strtolower($_flag));
-							//error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
+							if(mail_bo::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
 							$this->mail_bo->flagMessages($flag2set, $messageListForToggle,$folder);
 						}
 						if (count($messageList)>0)
 						{
 							$flag2set = 'un'.$_flag;
-							//error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
 							$this->mail_bo->flagMessages($flag2set, $messageList,$folder);
 						}
 						$alreadyFlagged=true;
@@ -4228,6 +4228,13 @@ class mail_ui
 						(in_array($_flag,array('read','flagged','label1','label2','label3','label4','label5')) &&
 						($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false))))
 					{
+						if ($query['filter'] && $query['filter'] !='any')
+						{
+							$filter['status'] = $query['filter'];
+							// since we toggle and we toggle by the filtered flag we must must change _flag
+							$_flag = ($query['filter']=='unseen' && $_flag=='read' ? 'read' : ($query['filter']=='seen'&& $_flag=='read'?'unread':($_flag==$query['filter']?'un'.$_flag:$_flag)));
+						}
+						if(mail_bo::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
 							$sort=0,
@@ -4242,7 +4249,7 @@ class mail_ui
 					}
 					else
 					{
-						//error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
+						if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
 						$alreadyFlagged=true;
 						$uidA = self::splitRowID($_messageList['msg'][0]);
 						$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
@@ -4262,7 +4269,7 @@ class mail_ui
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
 				}
-				//error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
+				if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
 				$this->mail_bo->flagMessages($_flag, ((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList),$folder);
 			}
 		}

From 67c939d0e1bf633f2240e206292efea18a08b784 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 14 Aug 2014 14:44:16 +0000
Subject: [PATCH 79/94] * MAIL/Compose: Make to/cc/bcc fields draggable and
 droppable. - Ctrl+ dragging copy the email to target, otherwise it moves to
 target.

---
 mail/js/app.js                     | 149 ++++++++++++++++++++++++++++-
 mail/templates/default/app.css     |   2 +
 mail/templates/default/compose.xet |   6 +-
 3 files changed, 153 insertions(+), 4 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 3dae9ee21e..884b97bd21 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -191,7 +191,7 @@ app.classes.mail = AppJS.extend(
 				var that = this;
 				this.mail_isMainWindow = false;
 				this.compose_fieldExpander_hide();
-
+				
 				/* Control focus actions on subject to handle expanders properly.*/
 				jQuery("#mail-compose_subject").on({
 					focus:function(){
@@ -203,6 +203,9 @@ app.classes.mail = AppJS.extend(
 				jQuery('#mail-compose').load ('load', function() {that.compose_resizeHandler();});
 
 				this.compose_fieldExpander();
+				
+				//Call drag_n_drop initialization for emails on compose
+				this.init_dndCompose();
 				break;
 		}
 	},
@@ -3649,6 +3652,150 @@ app.classes.mail = AppJS.extend(
 	vacation_change_account: function (_egw, _widget)
 	{
 		_widget.getInstanceManager().submit();
+	}, 
+	
+	/**
+	 * Set email items draggable 
+	 **/
+	set_dragging_dndCompose: function ()
+	{
+		var zIndex = 100;
+		var self = this;
+		
+		jQuery('div.ms-sel-item:not(div.ui-draggable)').draggable({
+			appendTo:'body',
+			//Performance wise better to not add ui-draggable class to items since we are not using that class
+			containment:'document',
+			distance: 0,
+			cursor:'move',
+			cursorAt:{left:2},
+			//cancel dragging on close button to avoid conflict with close action
+			cancel:'.ms-close-btn', 
+			/**
+			 * function to act on draggable item on revert's event 
+			 * @returns {Boolean} return true
+			 */
+			revert: function (){
+				this.parent().find('.ms-sel-item').css('position','relative');
+				return true;
+			},
+			/**
+			 * function to act as draggable starts dragging
+			 */
+			start:function(event, ui)
+			{
+				if (event.ctrlKey)
+				{
+					jQuery(this)
+							.addClass('mailCompose_copyEmail')
+							.css('cursor','copy');
+				}
+				jQuery(this).css ('z-index',zIndex++);
+				jQuery(this).css('position','absolute');
+			},
+			/**
+			 * 
+			 * @param {type} event
+			 * @param {type} ui
+			 */
+			create:function(event,ui)
+			{
+				jQuery(this).css('css','move');
+			}
+		});
+	},
+	
+	/**
+	 * Initialize dropping targets for draggable emails
+	 * -
+	 */ 
+	init_dndCompose: function ()
+	{
+		
+		var self = this;
+		//Call to make new items draggable
+		jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc').hover(function(){
+			self.set_dragging_dndCompose();
+		});
+		//Make used email-tag list widgets in mail compose droppable 
+		jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc').droppable({
+			access:'.ms-sel-item',
+			
+			/**
+			 * Run after a draggable email item dropped over one of the email-taglists
+			 * -Set the dropped item to the dropped current target widget
+			 * 
+			 * @param {type} event
+			 * @param {type} ui
+			 */
+			drop:function (event, ui)
+			{
+				var widget = self.et2.getWidgetById(this.getAttribute('name'));
+				var emails = [];
+				var fromWidget = {};
+				var draggedValue = ui.draggable.text();
+				
+				if (typeof widget != 'undefined')
+				{
+					emails = widget.get_value();
+					
+					if (emails) emails = emails.concat([draggedValue])
+					
+					widget.set_value(emails);
+				
+					var parentWidgetDOM = ui.draggable.parentsUntil('div[id^="mail-compoe_"]','.ui-droppable');
+					if (parentWidgetDOM != 'undefined' && parentWidgetDOM.length > 0)
+					{
+						fromWidget = self.et2.getWidgetById(parentWidgetDOM.attr('name'));
+					}
+										
+					if (!jQuery.isEmptyObject(fromWidget) 
+							&& !(ui.draggable.attr('class').search('mailCompose_copyEmail') > -1))
+					{
+						if (!_removeDragged(fromWidget, draggedValue))
+						{
+							//Not successful remove, returns the item to its origin
+							jQuery(ui.draggable).draggable('option','revert',true);
+						}
+					}
+					else
+					{
+						ui.draggable
+								.removeClass('mailCompose_copyEmail')
+								.css('cursor','move');
+					}
+					
+					//Destroy draggables after dropping, we need to enable them again
+					jQuery('div.ms-sel-item').draggable('destroy');
+				}
+			},
+		});
+		
+		/**
+		 * Remove dragged item from the widget which the item was dragged
+		 * 
+		 * @param {type} _widget
+		 * @param {type} _value
+		 * @return {boolean} true if successul | false unsuccessul
+		 */
+		var _removeDragged = function (_widget, _value)
+		{
+			if (_widget && _value)
+			{
+				var emails = _widget.get_value();
+				var itemIndex = emails.indexOf(_value);
+				if (itemIndex > -1)
+				{
+					emails.splice(itemIndex,1);
+					_widget.set_value(emails);
+				}
+				else
+				{
+					return false;
+				}
+			}
+			return true;
+		}
 	}
 });
 
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 4edcc380d4..4693039b37 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -720,4 +720,6 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
 	.et2_button {
 		display: none;
 	}
+	.mailCompose_emailCopy {
+	}
 }
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 9d28f8b259..6d21cd4673 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -70,7 +70,7 @@
 						</row>
 						<row class="mailComposeHeaders" >
 							<description value="To"/>
-							<taglist-email id="to" width="100%" onclick="app.mail.address_click" include_lists="true" span="2"/>
+							<taglist-email id="to" width="100%" onclick="app.mail.address_click" include_lists="true" span="2" onchange="app.mail.set_dragging_dndCompose"/>
 							<hbox>
 								<description id="cc_expander" value="Cc" onclick="app.mail.compose_fieldExpander"/>
 								<description id="bcc_expander" value="Bcc" onclick="app.mail.compose_fieldExpander"/>
@@ -78,12 +78,12 @@
 						</row>
 						<row class="mailComposeHeaders mailComposeJQueryCc">
 							<description value="Cc"/>
-							<taglist-email id="cc" width="100%" onclick="app.mail.address_click" include_lists="true" span="2"/>
+							<taglist-email id="cc" width="100%" onclick="app.mail.address_click" include_lists="true" span="2" onchange="app.mail.set_dragging_dndCompose"/>
 							<description/>
 						</row>
 						<row  class="mailComposeHeaders mailComposeJQueryBcc">
 							<description value="Bcc"/>
-							<taglist-email id="bcc" width="100%" onclick="app.mail.address_click" include_lists="true" span="2"/>
+							<taglist-email id="bcc" width="100%" onclick="app.mail.address_click" include_lists="true" span="2" onchange="app.mail.set_dragging_dndCompose"/>
 							<description/>
 						</row>
 						<row class="mailComposeHeaders">

From 1f3bb33fd8d696cecf364f7c41accc0d74a266fb Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 14 Aug 2014 15:38:32 +0000
Subject: [PATCH 80/94] implement some >mark all messages in folder as read<
 action

---
 mail/inc/class.mail_ui.inc.php | 10 +++++++++-
 mail/js/app.js                 | 15 ++++++++++++---
 mail/lang/egw_de.lang          |  2 ++
 mail/lang/egw_en.lang          |  2 ++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 100a581e6e..48fdf79a9f 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1393,6 +1393,14 @@ class mail_ui
 							'shortcut' => egw_keymanager::shortcut(egw_keymanager::U, true, true),
 
 						),
+						'readall' => array(
+							'group' => ++$group,
+							'caption' => "<font color='#ff0000'>".lang('mark all as read')."</font>",
+							'icon' => 'read_small',
+							'onExecute' => 'javaScript:app.mail.mail_flag',
+							'hint' => 'mark all messages in folder as read',
+							'toolbarDefault' => false
+						),
 						'undelete' => array(
 							'group' => $group,
 							'caption' => 'Undelete',
@@ -4281,7 +4289,7 @@ class mail_ui
 		if ($_sendJsonResponse)
 		{
 			$response = egw_json_response::get();
-			if ($query['filter'] && ($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false))
+			if ((isset($_messageList['all']) && $_messageList['all']) || ($query['filter'] && ($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false)))
 			{
 				$response->call('egw.refresh',lang('flagged %1 messages as %2 in %3',(isset($_messageList['all']) && $_messageList['all']?lang('all'):count($_messageList['msg'])),lang($_flag),$folder),'mail');
 			}
diff --git a/mail/js/app.js b/mail/js/app.js
index 884b97bd21..f6bf84d526 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1687,7 +1687,7 @@ app.classes.mail = AppJS.extend(
 		var obj_manager = egw_getObjectManager(this.appname).getObjectById(this.nm_index);
 		var that = this;
 		var rvMain = false;
-		if (obj_manager && _elems.length>1 && obj_manager.getAllSelected())
+		if ((obj_manager && _elems.length>1 && obj_manager.getAllSelected()) || _action.id=='readall')
 		{
 			if (_confirm)
 			{
@@ -1698,6 +1698,9 @@ app.classes.mail = AppJS.extend(
 				var messageToDisplay = '';
 				switch (_action.id)
 				{
+					case "readall":
+						messageToDisplay = this.egw.lang("Do you really want to mark ALL messages as read in the current folder?")+" ";
+						break;
 					case "unlabel":
 					case "label1":
 					case "label2":
@@ -1737,6 +1740,7 @@ app.classes.mail = AppJS.extend(
 						case "delete":
 							that.mail_callDelete(_action, _elems,rv);
 							break;
+						case "readall":
 						case "unlabel":
 						case "label1":
 						case "label2":
@@ -1877,6 +1881,7 @@ app.classes.mail = AppJS.extend(
 
 		var classToProcess = _action.id;
 		if (_action.id=='read') classToProcess='seen';
+		else if (_action.id=='readall') classToProcess='seen';
 		else if (_action.id=='label1') classToProcess='labelone';
 		else if (_action.id=='label2') classToProcess='labeltwo';
 		else if (_action.id=='label3') classToProcess='labelthree';
@@ -1888,7 +1893,7 @@ app.classes.mail = AppJS.extend(
 			msg = this.mail_getFormData(_elems);
 			msg['all'] = _allMessagesChecked;
 			if (msg['all']=='cancel') return false;
-			msg['activeFilters'] = this.mail_getActiveFilters(_action);
+			msg['activeFilters'] = (_action.id=='readall'?false:this.mail_getActiveFilters(_action));
 			if (_action.id.substring(0,2)=='un') {
 				//old style, only available for undelete and unlabel (no toggle)
 				if ( _action.id=='unlabel') // this means all labels should be removed
@@ -1904,6 +1909,10 @@ app.classes.mail = AppJS.extend(
 					this.mail_flagMessages(_action.id,msg,(do_nmactions?false:true));
 				}
 			}
+			else if (_action.id=='readall')
+			{
+				this.mail_flagMessages('read',msg,(do_nmactions?false:true));
+			}
 			else
 			{
 				var msg_set = {msg:[]};
@@ -1972,7 +1981,7 @@ app.classes.mail = AppJS.extend(
 		}
 		// only refresh counter. not grid as the ajaxmethod is called asyncronously
 		// on flagging, only seen/unseen has effect on counterdisplay
-		if (_action.id=='read') this.mail_refreshFolderStatus(_folder,'thisfolderonly',false,true);
+		if (_action.id=='read' || _action.id=='readall') this.mail_refreshFolderStatus(_folder,'thisfolderonly',false,true);
 		//this.mail_refreshFolderStatus();
 	},
 
diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index cc4bcce89e..05ddc732be 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -95,6 +95,7 @@ displaying plain messages is disabled	mail	de	Die Anzeige von reinen Text E-Mail
 do not auto create folders	mail	de	Automatische Ordnererstellung verhindern für
 do you really want to apply %1 to all messages in the current view?	mail	de	Wollen Sie wirklich %1 auf alle Nachrichten in der aktuellen Ansicht anwenden?
 do you really want to delete folder %1 ?	mail	de	Wollen Sie den Ordner %1 wirklich löschen?
+do you really want to mark ALL messages as read in the current folder?	mail	de	Wollen Sie wirklich alle eMails im aktuellen Ordner als gelesen markieren?
 do you really want to toggle flag %1 for all messages in current view?	mail	de	Wollen Sie wirklich den Wert für %1 für alle Nachrichten in der aktuellen Ansicht umschalten?
 do you want to be asked for confirmation before attaching selected messages to new mail?	mail	de	Möchten Sie vor dem Anhängen von einer oder mehreren (ausgewählten) E-Mails an eine neue E-Mail gefragt werden?
 do you want to be asked for confirmation before moving selected messages to another folder?	mail	de	Möchten Sie vor dem Verschieben von E-Mails in andere Ordner gefragt werden?
@@ -233,6 +234,7 @@ mail source	mail	de	Nachrichtenquelltext anzeigen
 mail-address	mail	de	Mail-Adresse
 mailaccount	mail	de	Mailkonto
 mailinglist	mail	de	Mailingliste
+mark all as read	mail	de	alle als Gelesen markieren
 mark as deleted	mail	de	als gelöscht markieren
 match:	mail	de	Übereinstimmung:
 matches	mail	de	stimmt überein (*, ? erlaubt)
diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang
index 3d44c6f45c..f5131278e3 100644
--- a/mail/lang/egw_en.lang
+++ b/mail/lang/egw_en.lang
@@ -95,6 +95,7 @@ displaying plain messages is disabled	mail	en	displaying plain messages is disab
 do not auto create folders	mail	en	do not auto create folders
 do you really want to apply %1 to all messages in the current view?	mail	en	Do you really want to apply %1 to ALL messages in the current view?
 do you really want to delete folder %1 ?	mail	en	Do you really want to DELETE Folder %1 ?
+do you really want to mark ALL messages as read in the current folder?	mail	en	Do you really want to mark ALL messages as read in the current folder?
 do you really want to toggle flag %1 for all messages in current view?	mail	en	Do you really want to toggle flag %1 for ALL messages in current view?
 do you want to be asked for confirmation before attaching selected messages to new mail?	mail	en	Do you want to be asked for confirmation before attaching selected messages to new mail?
 do you want to be asked for confirmation before moving selected messages to another folder?	mail	en	Do you want to be asked for confirmation before moving selected messages to another folder?
@@ -233,6 +234,7 @@ mail source	mail	en	Mail Source
 mail-address	mail	en	Mail-Address
 mailaccount	mail	en	Mailaccount
 mailinglist	mail	en	Mailinglist
+mark all as read	mail	en	mark all as read
 mark as deleted	mail	en	mark as deleted
 match:	mail	en	Match:
 matches	mail	en	matches

From a03a69bd8e0b0f84d83bbdc5062eeb17c9c6a987 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 15 Aug 2014 08:55:11 +0000
Subject: [PATCH 81/94] Override padding and border for remove class in
 fileupload progress, seems it gets padding from et2_link:firstChild class
 which is not meant to be set for remove div. -Fix wierd yellow box next to
 fileupload progress.

---
 etemplate/templates/default/etemplate2.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 0d6776a872..8b70d38526 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -484,11 +484,13 @@ div.et2_file {
 }
 /* Remove icon displayed when hovering */
 .et2_file .progress li div.remove {
-  display: inline-block;
+  display: inline;
   cursor: pointer;
   margin: 0px;
   width: 16px;
   height: 16px;
+  padding: 0;
+  border-radius: 0;
 }
 .et2_file .progress li:hover div.remove {
   width: 16px;

From 49f9086420efba219f0645b988d3f5e2c5a2258e Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 15 Aug 2014 09:38:37 +0000
Subject: [PATCH 82/94] fix typo

---
 addressbook/inc/class.addressbook_activesync.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_activesync.inc.php b/addressbook/inc/class.addressbook_activesync.inc.php
index 115442961a..eb4d2e4147 100644
--- a/addressbook/inc/class.addressbook_activesync.inc.php
+++ b/addressbook/inc/class.addressbook_activesync.inc.php
@@ -124,7 +124,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
 	{
 		static $abs;
 
-		if (!isset($abs) || !$resolve_all_in_one)
+		if (!isset($abs) || !$return_all_in_one)
 		{
 			if ($return_all_in_one && $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'])
 			{

From e47db95be7515896ebd316fa321bedaa03014bf9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 15 Aug 2014 11:22:43 +0000
Subject: [PATCH 83/94] * Mail: fixed sometimes not working (un)subscribe of
 mailboxes, added better diagnostic and automatic (de)select children

---
 etemplate/js/et2_widget_tree.js      |  13 +++
 mail/inc/class.mail_ui.inc.php       | 150 +++++++++++----------------
 mail/js/app.js                       |  79 ++++++++------
 mail/lang/egw_de.lang                |   8 +-
 mail/lang/egw_en.lang                |   8 +-
 mail/lang/egw_it.lang                |   2 +-
 mail/lang/egw_pt.lang                |   2 +-
 mail/templates/default/subscribe.xet |   4 +-
 8 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/etemplate/js/et2_widget_tree.js b/etemplate/js/et2_widget_tree.js
index 4ed5148739..f4868eed2d 100644
--- a/etemplate/js/et2_widget_tree.js
+++ b/etemplate/js/et2_widget_tree.js
@@ -818,6 +818,19 @@ var et2_tree = et2_inputWidget.extend(
 		}
 	},
 
+	/**
+	 * Set state of node incl. it's children
+	 *
+	 * @param {string} _id id of node
+	 * @param {boolean|string} _state or "toggle" to toggle state
+	 */
+	setSubChecked: function(_id, _state)
+	{
+		if (_state === "toggle") _state = !this.input.isItemChecked(_id);
+
+		this.input.setSubChecked(_id, _state);
+	},
+
 	/**
 	 * Get URL relative to image_path option
 	 *
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 48fdf79a9f..fe9052f9d7 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -230,87 +230,36 @@ class mail_ui
 		if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
 	}
 
-	/**
-	 * Subscribe or Unsubscribe to a folder
-	 * also it is consider if the folder is valid to un/subscribe
-	 *
-	 * @param boolean $folderName subscribe if true and unsubscribe if false
-	 * @param string $status folder name
-	 *
-	 * @example setSubscribe('INBOX', true) subscribe to folder INBOX
-	 *
-	 */
-	function setSubscribe ($folderName,$status=true)
-	{
-		$validFolder = true;
-		$result = true;
-		$nameSpaces = $this->mail_bo->_getNameSpaces();
-
-		foreach($nameSpaces as &$value )
-		{
-			if (str_replace($value['delimiter'],"",$value['prefix']) == $folderName &&
-					$value['type'] == 'others' || $value['type'] == 'shared')
-			{
-				$validFolder = false;
-			}
-		}
-
-		if ($status && $validFolder)
-		{
-			try
-			{
-				$this->mail_bo->subscribe($folderName, $status);
-			} catch (Exception $e)
-			{
-				$result = false;
-				error_log(__METHOD__.__LINE__."() error ".$e->getMessage()." happend while subscribing to folder ". $folderName );
-			}
-
-		}
-		else if($validFolder)
-		{
-			try
-			{
-				$this->mail_bo->subscribe($folderName, $status);
-			} catch (Exception $e)
-			{
-				$result = false;
-				error_log(__METHOD__.__LINE__."() error ".$e->getMessage()." happend while unsubscribing of folder ". $folderName );
-			}
-		}
-		return $result;
-	}
-
 	/**
 	 * Subscription popup window
 	 *
 	 * @param array $content
 	 * @param type $msg
 	 */
-	function subscription(array $content=null ,$msg='')
+	function subscription(array $content=null ,$msg=null)
 	{
 		$stmpl = new etemplate_new('mail.subscribe');
 
-		$profileId = $_GET['acc_id'];
-
-		$allFolders = $this->mail_bo->getFolderObjects(false,false,false,false);
-		$sel_options['foldertree'] =  $this->getFolderTree(false, $profileId,false,false);
+		if(is_array($content))
+		{
+			$profileId = $content['profileId'];
+		}
+		elseif (!($profileId = (int)$_GET['acc_id']))
+		{
+			egw_framework::window_close('Missing acc_id!');
+		}
+		$sel_options['foldertree'] =  $this->getFolderTree(false, $profileId, false, false);
 
 		if (!is_array($content))
 		{
-			if ($profileId)
+			$content['foldertree'] = array();
+			$allFolders = $this->mail_bo->getFolderObjects(false,false,false,false);
+			foreach ($allFolders as $folder)
 			{
-
-				$content['foldertree'] = array();
-				$content['profileId'] = $profileId;
-
-				foreach ($allFolders as $folder)
+				$folderName = $profileId . self::$delimiter . $folder->folderName;
+				if ($folder->subscribed)
 				{
-					$folderName = $profileId . self::$delimiter . $folder->folderName;
-					if ($folder->subscribed)
-					{
-						array_push($content['foldertree'], $folderName);
-					}
+					array_push($content['foldertree'], $folderName);
 				}
 			}
 		}
@@ -322,48 +271,65 @@ class mail_ui
 				case 'save':
 				case 'apply':
 				{
-					foreach ($allFolders as $folder)
+					// do not let user (un)subscribe namespace roots eg. "other", "user" or "INBOX", same for tree-root/account itself
+					$namespace_roots = array($profileId);
+					foreach($this->mail_bo->_getNameSpaces() as $namespace)
 					{
-						$folderName = $content['profileId'] . self::$delimiter . $folder->folderName;
-						if (!in_array($folderName, $content['foldertree']))
+						$namespace_roots[] = $profileId . self::$delimiter . str_replace($namespace['delimiter'], '', $namespace['prefix']);
+					}
+					error_log(__METHOD__."() namespace_roots=".array2string($namespace_roots));
+					$to_subscribe = array_diff($content['foldertree'], $content['current_subscribed'], $namespace_roots);
+					$to_unsubscribe = array_diff($content['current_subscribed'], $content['foldertree'], $namespace_roots);
+					foreach(array_merge($to_subscribe, $to_unsubscribe) as $mailbox)
+					{
+						$subscribe = in_array($mailbox, $to_subscribe);
+						list(,$mailbox) = explode(self::$delimiter, $mailbox);	// remove profileId and delimiter
+						try {
+							$this->mail_bo->icServer->subscribeMailbox($mailbox, $subscribe);
+						}
+						catch (Exception $ex)
 						{
-							if($this->setSubscribe($folder->folderName, false))
+							$msg_type = 'error';
+							if ($subscribe)
 							{
-								$msg = lang('Subscription successfully saved!');
-
+								$msg .= lang('Failed to subscribe folder %1!', $mailbox).' '.$ex->getMessage();
 							}
 							else
 							{
-								$msg = lang('Subscription faild!');
+								$msg .= lang('Failed to unsubscribe folder %1!', $mailbox).' '.$ex->getMessage();
 							}
 						}
+					}
+					if (!isset($msg))
+					{
+						$msg_type = 'success';
+						if ($to_subscribe || $to_unsubscribe)
+						{
+							$msg = lang('Subscription successfully saved.');
+						}
 						else
 						{
-							if($this->setSubscribe($folder->folderName, true))
-							{
-								$msg = lang('Subscription successfully saved!');
-							}
-							else
-							{
-								$msg = lang('Subscription faild!');
-							}
+							$msg = lang('Nothing to change.');
 						}
 					}
+					// update foldertree in main window
 					$parentFolder='INBOX';
-
 					$refreshData = array(
-						$content['profileId'] => lang($parentFolder)
+						$profileId => lang($parentFolder)
 					);
-
-					// Send full info back in the response
 					$response = egw_json_response::get();
 					foreach($refreshData as $folder => &$name)
 					{
-						$name = $this->getFolderTree(true, $folder, true, true,false);
+						$name = $this->getFolderTree(true, $folder, true, true, false);
 					}
+					// give success/error message to opener and popup itself
 					$response->call('opener.app.mail.mail_reloadNode',$refreshData);
-					egw_framework::refresh_opener($msg, 'mail');
-					if ($button == 'apply') break;
+					egw_framework::refresh_opener($msg, 'mail', null, null, null, null, null, $msg_type);
+					if ($button == 'apply')
+					{
+						egw_framework::message($msg, $msg_type);
+						break;
+					}
 				}
 				case 'cancel':
 				{
@@ -372,10 +338,10 @@ class mail_ui
 			}
 		}
 
-		$preserv['profileId'] = $content['profileId'];
+		$preserv['profileId'] = $profileId;
+		$preserv['current_subscribed'] = $content['foldertree'];
 		$readonlys = array();
 
-
 		$stmpl->exec('mail.mail_ui.subscription', $content,$sel_options,$readonlys,$preserv,2);
 	}
 
@@ -4067,7 +4033,7 @@ class mail_ui
 				$response->call('app.mail.lock_tree');
 			}
 			$this->mail_bo->compressFolder($trashFolder);
-			
+
 			$heirarchyDelimeter = $this->mail_bo->getHierarchyDelimiter(true);
 			$fShortName =  array_pop(explode($heirarchyDelimeter, $trashFolder));
 			$fStatus = array(
diff --git a/mail/js/app.js b/mail/js/app.js
index f6bf84d526..d9db89afee 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -191,7 +191,7 @@ app.classes.mail = AppJS.extend(
 				var that = this;
 				this.mail_isMainWindow = false;
 				this.compose_fieldExpander_hide();
-				
+
 				/* Control focus actions on subject to handle expanders properly.*/
 				jQuery("#mail-compose_subject").on({
 					focus:function(){
@@ -203,7 +203,7 @@ app.classes.mail = AppJS.extend(
 				jQuery('#mail-compose').load ('load', function() {that.compose_resizeHandler();});
 
 				this.compose_fieldExpander();
-				
+
 				//Call drag_n_drop initialization for emails on compose
 				this.init_dndCompose();
 				break;
@@ -1139,7 +1139,7 @@ app.classes.mail = AppJS.extend(
 		// as jsonq is too fast wrap it to be delayed a bit, to ensure the folder actions
 		// are executed last of the queue
 		window.setTimeout(function() {
-			egw.jsonq('mail.mail_ui.ajax_setFolderStatus',[_folders], function (){self.unlock_tree()});
+			egw.jsonq('mail.mail_ui.ajax_setFolderStatus',[_folders], function (){self.unlock_tree();});
 		}, 100);
 	},
 
@@ -1547,7 +1547,7 @@ app.classes.mail = AppJS.extend(
 		var self = this;
 
 		this.egw.message(this.egw.lang('empty trash'));
-		egw.json('mail.mail_ui.ajax_emptyTrash',[server[0], activeFilters['selectedFolder']? activeFilters['selectedFolder']:null],function(){self.unlock_tree()})
+		egw.json('mail.mail_ui.ajax_emptyTrash',[server[0], activeFilters['selectedFolder']? activeFilters['selectedFolder']:null],function(){self.unlock_tree();})
 			.sendRequest(true);
 
 		// Directly delete any trash cache for selected server
@@ -3097,8 +3097,9 @@ app.classes.mail = AppJS.extend(
 			tmp = aliases.concat(addr.get_value());
 
 			// returns de-duplicate items of an array
-			var deDuplicator = function (item,pos){
-									return tmp.indexOf(item) == pos
+			var deDuplicator = function (item,pos)
+			{
+				return tmp.indexOf(item) == pos;
 			};
 
 			aliases = tmp.filter(deDuplicator);
@@ -3374,6 +3375,19 @@ app.classes.mail = AppJS.extend(
 			.sendRequest();
 	},
 
+	/**
+	 * Onclick for node/foldername in subscription popup
+	 *
+	 * Used to (un)check node including all children
+	 *
+	 * @param {string} _id id of clicked node
+	 * @param {et2_tree} _widget reference to tree widget
+	 */
+	subscribe_onclick: function(_id, _widget)
+	{
+		_widget.setSubChecked(_id, "toggle");
+	},
+
 	/**
 	 * Edit a folder acl for account(s)
 	 *
@@ -3661,16 +3675,16 @@ app.classes.mail = AppJS.extend(
 	vacation_change_account: function (_egw, _widget)
 	{
 		_widget.getInstanceManager().submit();
-	}, 
-	
+	},
+
 	/**
-	 * Set email items draggable 
+	 * Set email items draggable
 	 **/
 	set_dragging_dndCompose: function ()
 	{
 		var zIndex = 100;
 		var self = this;
-		
+
 		jQuery('div.ms-sel-item:not(div.ui-draggable)').draggable({
 			appendTo:'body',
 			//Performance wise better to not add ui-draggable class to items since we are not using that class
@@ -3679,9 +3693,9 @@ app.classes.mail = AppJS.extend(
 			cursor:'move',
 			cursorAt:{left:2},
 			//cancel dragging on close button to avoid conflict with close action
-			cancel:'.ms-close-btn', 
+			cancel:'.ms-close-btn',
 			/**
-			 * function to act on draggable item on revert's event 
+			 * function to act on draggable item on revert's event
 			 * @returns {Boolean} return true
 			 */
 			revert: function (){
@@ -3690,6 +3704,9 @@ app.classes.mail = AppJS.extend(
 			},
 			/**
 			 * function to act as draggable starts dragging
+			 *
+			 * @param {type} event
+			 * @param {type} ui
 			 */
 			start:function(event, ui)
 			{
@@ -3703,7 +3720,7 @@ app.classes.mail = AppJS.extend(
 				jQuery(this).css('position','absolute');
 			},
 			/**
-			 * 
+			 *
 			 * @param {type} event
 			 * @param {type} ui
 			 */
@@ -3713,27 +3730,27 @@ app.classes.mail = AppJS.extend(
 			}
 		});
 	},
-	
+
 	/**
 	 * Initialize dropping targets for draggable emails
 	 * -
-	 */ 
+	 */
 	init_dndCompose: function ()
 	{
-		
+
 		var self = this;
 		//Call to make new items draggable
 		jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc').hover(function(){
 			self.set_dragging_dndCompose();
 		});
-		//Make used email-tag list widgets in mail compose droppable 
+		//Make used email-tag list widgets in mail compose droppable
 		jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc').droppable({
 			access:'.ms-sel-item',
-			
+
 			/**
 			 * Run after a draggable email item dropped over one of the email-taglists
 			 * -Set the dropped item to the dropped current target widget
-			 * 
+			 *
 			 * @param {type} event
 			 * @param {type} ui
 			 */
@@ -3743,22 +3760,22 @@ app.classes.mail = AppJS.extend(
 				var emails = [];
 				var fromWidget = {};
 				var draggedValue = ui.draggable.text();
-				
+
 				if (typeof widget != 'undefined')
 				{
 					emails = widget.get_value();
-					
-					if (emails) emails = emails.concat([draggedValue])
-					
+
+					if (emails) emails = emails.concat([draggedValue]);
+
 					widget.set_value(emails);
-				
+
 					var parentWidgetDOM = ui.draggable.parentsUntil('div[id^="mail-compoe_"]','.ui-droppable');
 					if (parentWidgetDOM != 'undefined' && parentWidgetDOM.length > 0)
 					{
 						fromWidget = self.et2.getWidgetById(parentWidgetDOM.attr('name'));
 					}
-										
-					if (!jQuery.isEmptyObject(fromWidget) 
+
+					if (!jQuery.isEmptyObject(fromWidget)
 							&& !(ui.draggable.attr('class').search('mailCompose_copyEmail') > -1))
 					{
 						if (!_removeDragged(fromWidget, draggedValue))
@@ -3773,16 +3790,16 @@ app.classes.mail = AppJS.extend(
 								.removeClass('mailCompose_copyEmail')
 								.css('cursor','move');
 					}
-					
+
 					//Destroy draggables after dropping, we need to enable them again
 					jQuery('div.ms-sel-item').draggable('destroy');
 				}
-			},
+			}
 		});
-		
+
 		/**
 		 * Remove dragged item from the widget which the item was dragged
-		 * 
+		 *
 		 * @param {type} _widget
 		 * @param {type} _value
 		 * @return {boolean} true if successul | false unsuccessul
@@ -3804,7 +3821,7 @@ app.classes.mail = AppJS.extend(
 				}
 			}
 			return true;
-		}
+		};
 	}
 });
 
diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index 05ddc732be..0fc7db30aa 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -95,7 +95,7 @@ displaying plain messages is disabled	mail	de	Die Anzeige von reinen Text E-Mail
 do not auto create folders	mail	de	Automatische Ordnererstellung verhindern für
 do you really want to apply %1 to all messages in the current view?	mail	de	Wollen Sie wirklich %1 auf alle Nachrichten in der aktuellen Ansicht anwenden?
 do you really want to delete folder %1 ?	mail	de	Wollen Sie den Ordner %1 wirklich löschen?
-do you really want to mark ALL messages as read in the current folder?	mail	de	Wollen Sie wirklich alle eMails im aktuellen Ordner als gelesen markieren?
+do you really want to mark all messages as read in the current folder?	mail	de	Wollen Sie wirklich alle eMails im aktuellen Ordner als gelesen markieren?
 do you really want to toggle flag %1 for all messages in current view?	mail	de	Wollen Sie wirklich den Wert für %1 für alle Nachrichten in der aktuellen Ansicht umschalten?
 do you want to be asked for confirmation before attaching selected messages to new mail?	mail	de	Möchten Sie vor dem Anhängen von einer oder mehreren (ausgewählten) E-Mails an eine neue E-Mail gefragt werden?
 do you want to be asked for confirmation before moving selected messages to another folder?	mail	de	Möchten Sie vor dem Verschieben von E-Mails in andere Ordner gefragt werden?
@@ -147,6 +147,8 @@ failed to delete %1 ! reason: %2	mail	de	Löschen von %1 fehlgeschlagen! Grund:
 failed to delete %1. server responded:	mail	de	Löschen von %1 fehlgeschlagen! Grund: %2
 failed to move %1 ! reason: %2	mail	de	Verschieben von %1 fehlgeschlagen! Grund: %2
 failed to rename %1 ! reason: %2	mail	de	Umbenenne zu %1 fehlgeschlagen! Grund: %2
+failed to subscribe folder %1!	mail	de	Fehler beim Abonnieren des Folders %1!
+failed to unsubscribe folder %1!	mail	de	Fehler beim Abbestellen des Folders %1!
 file into	mail	de	verschiebe nach
 file into:	mail	de	verschieben nach:
 file rejected, no %2. is:%1	mail	de	Datei abgelehnt; die vorliegende Datei ist nicht vom Typ %2. Sie ist vom Typ %1
@@ -271,6 +273,7 @@ no text body supplied, check attachments for message text	mail	de	Keine Text vor
 no valid %1 folder configured!	mail	de	Kein gültiger %1 Ordner eingestellt!
 non	mail	de	Kein
 none, create all	mail	de	keine, erstellt alle
+nothing to change.	mail	de	Nichts zu Ändern.
 notify about new mail in this folders	mail	de	Über neue Mails in diesem Ordner benachrichtigen
 notify when new mails arrive in these folders	mail	de	Benachrichtigung, sobald neue E-Mails in den folgenden Ordnern ankommen
 on	mail	de	am
@@ -392,9 +395,8 @@ subject(a->z)	mail	de	Betreff (A->Z)
 subject(z->a)	mail	de	Betreff (Z->A)
 subscribe folder	mail	de	Abonnieren
 subscribe folder ...	mail	de	Ordner abonieren ...
-subscription faild!	mail	de	Das Abonnieren ist fehlgeschlagen.
 subscription folders	mail	de	Ordner Abonieren
-subscription successfully saved!	mail	de	Das Abonnieren der Ordner wurde erfolgreich gespeichert.
+subscription successfully saved.	mail	de	Das Abonnieren der Ordner wurde erfolgreich gespeichert.
 successfully connected	mail	de	erfolgreich verbunden
 template folder	mail	de	Vorlagen Ordner
 templates	mail	de	Vorlagen
diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang
index f5131278e3..0c4552e82b 100644
--- a/mail/lang/egw_en.lang
+++ b/mail/lang/egw_en.lang
@@ -95,7 +95,7 @@ displaying plain messages is disabled	mail	en	displaying plain messages is disab
 do not auto create folders	mail	en	do not auto create folders
 do you really want to apply %1 to all messages in the current view?	mail	en	Do you really want to apply %1 to ALL messages in the current view?
 do you really want to delete folder %1 ?	mail	en	Do you really want to DELETE Folder %1 ?
-do you really want to mark ALL messages as read in the current folder?	mail	en	Do you really want to mark ALL messages as read in the current folder?
+do you really want to mark all messages as read in the current folder?	mail	en	Do you really want to mark ALL messages as read in the current folder?
 do you really want to toggle flag %1 for all messages in current view?	mail	en	Do you really want to toggle flag %1 for ALL messages in current view?
 do you want to be asked for confirmation before attaching selected messages to new mail?	mail	en	Do you want to be asked for confirmation before attaching selected messages to new mail?
 do you want to be asked for confirmation before moving selected messages to another folder?	mail	en	Do you want to be asked for confirmation before moving selected messages to another folder?
@@ -147,6 +147,8 @@ failed to delete %1 ! reason: %2	mail	en	failed to delete %1 ! Reason: %2
 failed to delete %1. server responded:	mail	en	Failed to delete %1. Server responded:
 failed to move %1 ! reason: %2	mail	en	failed to move %1 ! Reason: %2
 failed to rename %1 ! reason: %2	mail	en	failed to rename %1 ! Reason: %2
+failed to subscribe folder %1!	mail	en	Failed to subscribe folder %1!
+failed to unsubscribe folder %1!	mail	en	Failed to unsubscribe folder %1!
 file into	mail	en	file into
 file into:	mail	en	File into:
 file rejected, no %2. is:%1	mail	en	File rejected, no %2. Is:%1
@@ -271,6 +273,7 @@ no text body supplied, check attachments for message text	mail	en	no text body s
 no valid %1 folder configured!	mail	en	No valid %1 folder configured!
 non	mail	en	Non
 none, create all	mail	en	none, create all
+nothing to change.	mail	en	Nothing to change.
 notify about new mail in this folders	mail	en	Notify about new mail in this folders
 notify when new mails arrive in these folders	mail	en	notify when new mails arrive in these folders
 on	mail	en	on
@@ -392,9 +395,8 @@ subject(a->z)	mail	en	subject(A->Z)
 subject(z->a)	mail	en	subject(Z->A)
 subscribe folder	mail	en	Subscribe folder
 subscribe folder ...	mail	en	Subscribe folder ...
-subscription faild!	mail	en	Subscription faild!
 subscription folders	mail	en	Subscription folders
-subscription successfully saved!	mail	en	Subscription successfully saved!
+subscription successfully saved.	mail	en	Subscription successfully saved.
 successfully connected	mail	en	Successfully connected
 template folder	mail	en	template folder
 templates	mail	en	Templates
diff --git a/mail/lang/egw_it.lang b/mail/lang/egw_it.lang
index d03a7636c9..81a4162e37 100644
--- a/mail/lang/egw_it.lang
+++ b/mail/lang/egw_it.lang
@@ -380,7 +380,7 @@ subscribe folder	mail	it	Sottoscrivi cartella
 subscribe folder ...	mail	it	Sottoscrivi cartella...
 subscription faild!	mail	it	Sottoscrizione fallita!
 subscription folders	mail	it	Cartelle da sottoscrivere
-subscription successfully saved!	mail	it	Sottoscrizione salvata corretamente!
+subscription successfully saved.	mail	it	Sottoscrizione salvata corretamente.
 successfully connected	mail	it	Connesso con successo
 template folder	mail	it	Cartella dei modelli
 templates	mail	it	Modelli
diff --git a/mail/lang/egw_pt.lang b/mail/lang/egw_pt.lang
index 32b8fa0c1d..9969509684 100644
--- a/mail/lang/egw_pt.lang
+++ b/mail/lang/egw_pt.lang
@@ -341,7 +341,7 @@ subscribe folder	mail	pt	Assinar pasta
 subscribe folder ...	mail	pt	Assinar pasta ...
 subscription faild!	mail	pt	Faild Assinatura!
 subscription folders	mail	pt	Pastas de Subscrição
-subscription successfully saved!	mail	pt	Assinatura salvo com sucesso!
+subscription successfully saved.	mail	pt	Assinatura salvo com sucesso.
 successfully connected	mail	pt	Conectado com sucesso
 template folder	mail	pt	pasta de modelo
 templates	mail	pt	Templates
diff --git a/mail/templates/default/subscribe.xet b/mail/templates/default/subscribe.xet
index a99a2506f9..0ba47e61f0 100755
--- a/mail/templates/default/subscribe.xet
+++ b/mail/templates/default/subscribe.xet
@@ -12,7 +12,7 @@
 				</row>
 				<row>
 					<box scrolling="auto">
-						<tree id="foldertree" onclick=""  multiple="true"/>
+						<tree id="foldertree" onclick="app.mail.subscribe_onclick"  multiple="true"/>
 					</box>
 				</row>
 			</rows>
@@ -20,7 +20,7 @@
 		<hbox  class="dialogFooterToolbar">
 			<button statustext="Saves subscription changes" label="Save" id="button[save]"/>
 			<button statustext="Applies the changes made" label="Apply" id="button[apply]"/>
-			<button label="Cancel" id="button[cancel]"/>
+			<button label="Cancel" id="button[cancel]" onclick="window.close()"/>
 		</hbox>
 	</template>
 </overlay>

From 947f6b1551a74aed9b7ce3908398ccdefac1fd2b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 18 Aug 2014 10:33:22 +0000
Subject: [PATCH 84/94] fixed PHP Fatal error " Call to undefined method
 emailadmin_imapbase::subscribe" since r48090

---
 mail/inc/class.mail_ui.inc.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index fe9052f9d7..8ce4313747 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -664,7 +664,7 @@ class mail_ui
 		//Change the mail_bo object to related profileId
 		$this->changeProfile($_acc_id);
 
-		if($this->mail_bo->subscribe($_folderName, $_status))
+		if($this->mail_bo->icServer->subscribeMailbox($_folderName, $_status))
 		{
 			$this->mail_bo->resetFolderObjectCache($_acc_id);
 			$this->ajax_reloadNode($_acc_id,!$this->mail_bo->mailPreferences['showAllFoldersInFolderPane']);
@@ -3439,7 +3439,7 @@ class mail_ui
 							}
 							else
 							{
-								$rv = $this->mail_bo->subscribe($folder, false);
+								$rv = $this->mail_bo->icServer->subscribeMailbox($folder, false);
 								$fragments[$profileID.self::$delimiter.$folder] = substr($folder,strlen($folderName));
 							}
 						}
@@ -3454,8 +3454,8 @@ class mail_ui
 						{
 							$this->mail_bo->resetFolderObjectCache($profileID);
 							//enforce the subscription to the newly named server, as it seems to fail for names with umlauts
-							$rv = $this->mail_bo->subscribe($newFolderName, true);
-							$rv = $this->mail_bo->subscribe($folderName, false);
+							$rv = $this->mail_bo->icServer->subscribeMailbox($newFolderName, true);
+							$rv = $this->mail_bo->icServer->subscribeMailbox($folderName, false);
 							$success = true;
 						}
 					}
@@ -3479,7 +3479,7 @@ class mail_ui
 							}
 							else
 							{
-								$rv = $this->mail_bo->subscribe($folder, true);
+								$rv = $this->mail_bo->icServer->subscribeMailbox($folder, true);
 							}
 						}
 						//error_log(__METHOD__.__LINE__.' Fetched Subfolders->'.array2string($subFolders));
@@ -3642,7 +3642,7 @@ class mail_ui
 							}
 							else
 							{
-								$rv = $this->mail_bo->subscribe($folder, false);
+								$rv = $this->mail_bo->icServer->subscribeMailbox($folder, false);
 							}
 						}
 					}
@@ -3655,8 +3655,8 @@ class mail_ui
 						{
 							$this->mail_bo->resetFolderObjectCache($profileID);
 							//enforce the subscription to the newly named server, as it seems to fail for names with umlauts
-							$rv = $this->mail_bo->subscribe($newFolderName, true);
-							$rv = $this->mail_bo->subscribe($folderName, false);
+							$rv = $this->mail_bo->icServer->subscribeMailbox($newFolderName, true);
+							$rv = $this->mail_bo->icServer->subscribeMailbox($folderName, false);
 							$this->mail_bo->resetFolderObjectCache($profileID);
 							$success = true;
 						}
@@ -3681,7 +3681,7 @@ class mail_ui
 							}
 							else
 							{
-								$rv = $this->mail_bo->subscribe($folder, true);
+								$rv = $this->mail_bo->icServer->subscribeMailbox($folder, true);
 							}
 						}
 						//error_log(__METHOD__.__LINE__.' Fetched Subfolders->'.array2string($subFolders));

From 161734f941de98d37281f15b3b8705ae38e9e9d8 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 18 Aug 2014 12:05:04 +0000
Subject: [PATCH 85/94] Handle validation_error if widget is children of a
 tabbox. -Fix widget with validation error does not activate its related tab.

---
 etemplate/js/etemplate2.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index 2c8268c4c3..799495ecd1 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -948,6 +948,16 @@ function etemplate2_handle_validation_error(_type, _response)
 		if(widget)
 		{
 			widget.showMessage(_response.data[id],'validation_error');
+
+			// Handle validation_error (messages coming back from server as a response) if widget is children of a tabbox
+			var tmpWidget = widget;
+			while(tmpWidget._parent && tmpWidget._type != 'tabbox')
+			{
+				tmpWidget = tmpWidget._parent;
+			}
+			//Acvtivate the tab where the widget with validation error is located
+			if (tmpWidget._type == 'tabbox') tmpWidget.activateTab(widget);
+
 		}
 	}
 	egw().debug("warn","Validation errors", _response.data);

From 5b91e871de59ca28fcee17af0d381bafd3d28ac0 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 18 Aug 2014 16:47:27 +0000
Subject: [PATCH 86/94] Deal with languages helpfully adding timezones into
 timestamps Fixes random (12, 6, 7) hours sometimes added to dates

---
 .../inc/class.etemplate_widget_date.inc.php   |  8 +++++
 etemplate/js/et2_widget_date.js               | 35 +++++++++++++------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_date.inc.php b/etemplate/inc/class.etemplate_widget_date.inc.php
index 4fbfe57ef7..46bcc4bc99 100644
--- a/etemplate/inc/class.etemplate_widget_date.inc.php
+++ b/etemplate/inc/class.etemplate_widget_date.inc.php
@@ -66,6 +66,12 @@ class etemplate_widget_date extends etemplate_widget_transformer
 			$value = self::get_array($content, $form_name);
 			$valid =& self::get_array($validated, $form_name, true);
 
+			// Client / etemplate always deals in 'user time', which has no timezone
+			// The change to server time is handled elsewhere
+			// Change to UTC to avoid PHP doing automatic timezone math
+			$default_tz = date_default_timezone_get();
+			date_default_timezone_set('UTC');
+
 			if ((string)$value === '' && $this->attrs['needed'])
 			{
 				self::set_validation_error($form_name,lang('Field must not be empty !!!'));
@@ -92,6 +98,8 @@ class etemplate_widget_date extends etemplate_widget_transformer
 				// this is not really a user error, but one of the clientside engine
 				self::set_validation_error($form_name,lang("'%1' is not a valid date !!!", $value).' '.$this->dataformat);
 			}
+
+			date_default_timezone_set($default_tz);
 		}
 	}
 }
diff --git a/etemplate/js/et2_widget_date.js b/etemplate/js/et2_widget_date.js
index 868de776f0..e1dd5321d4 100644
--- a/etemplate/js/et2_widget_date.js
+++ b/etemplate/js/et2_widget_date.js
@@ -23,6 +23,11 @@
 /**
  * Class which implements the "date" XET-Tag
  *
+ * Care must be taken anytime a date from the user is parsed.  eTemplate client
+ * side dates are all in 'user time', which is dealt with on the server and has
+ * no timezone.  Javascript uses the browser's timezone, which affects parsing
+ * and calculations.
+ *
  * @augments et2_inputWidget
  */
 var et2_date = et2_inputWidget.extend(
@@ -146,7 +151,8 @@ var et2_date = et2_inputWidget.extend(
 						return;
 					}
 					this.set_validation_error(false);
-					this.date.setHours(parsed.hour);
+					// Avoid javascript timezone offset, hour is in 'user time'
+					this.date.setUTCHours(parsed.hour);
 					this.date.setMinutes(parsed.minute);
 					this.input_date.val(_value);
 					if(old_value !== this.getValue())
@@ -173,7 +179,6 @@ var et2_date = et2_inputWidget.extend(
 								var DTformat = this.options.data_format.split(' ');
 								var parsed = jQuery.datepicker.parseDateTime(this.egw().dateTimeFormat(DTformat[0]),this.egw().dateTimeFormat(DTformat[1]), _value);
 						}
-						this.date = new Date(parsed);
 					}
 					else  // Parse other date widgets date with timepicker date/time format to date onject
 					{
@@ -184,9 +189,12 @@ var et2_date = et2_inputWidget.extend(
 							this.set_validation_error(this.egw().lang("%1' han an invalid format !!!",_value));
 							return;
 						}
-						this.date = new Date(parsed);
 					}
-
+					// Update local variable, but remove the timezone offset that javascript adds
+					if(parsed)
+					{
+						this.date = new Date(parsed.valueOf() - (parsed.getTimezoneOffset()*60*1000));
+					}
 
 					this.set_validation_error(false);
 			}
@@ -204,7 +212,10 @@ var et2_date = et2_inputWidget.extend(
 		_value = '';
 		if(this._type != 'date-timeonly')
 		{
-			_value = jQuery.datepicker.formatDate(this.input_date.datepicker("option","dateFormat"),this.date);
+			_value = jQuery.datepicker.formatDate(this.input_date.datepicker("option","dateFormat"),
+				// Add timezone offset for datepicker format, or it will lose that many hours
+				new Date(this.date.valueOf() + (this.date.getTimezoneOffset()*60*1000))
+			);
 		}
 		if(this._type != 'date')
 		{
@@ -238,12 +249,7 @@ var et2_date = et2_inputWidget.extend(
 			this.date.setMonth(0);
 			this.date.setFullYear(1970);
 		}
-		// this is a hack, to work around birthdays changing one day for each time they are stored
-		// ToDo: either find and fix the reason, or send date as YYYY-mm-dd string to server
-		else if (this._type == 'date')
-		{
-			this.date.setHours(12);
-		}
+		
 		// Convert to timestamp - no seconds
 		this.date.setSeconds(0,0);
 		return Math.round(this.date.valueOf() / 1000);
@@ -645,6 +651,13 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM],
 						jQuery.datepicker.parseDateTime(this.egw().preference('dateformat'),this.egw().preference('timeformat') == '24' ? 'H:i' : 'g:i a', _value);
 
 			var text = new Date(parsed);
+
+			// Update local variable, but remove the timezone offset that javascript adds
+			if(parsed)
+			{
+				this.date = new Date(text.valueOf() - (text.getTimezoneOffset()*60*1000));
+			}
+
 			// JS dates use milliseconds
 			this.date.setTime(text.valueOf());
 		}

From 1e5ea675959b19a93062fd8a82d9d8b755ce968e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 18 Aug 2014 17:33:43 +0000
Subject: [PATCH 87/94] Fix unable to have checkboxes with an unselected value
 that evaluates to false.

---
 .../class.etemplate_widget_checkbox.inc.php   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_checkbox.inc.php b/etemplate/inc/class.etemplate_widget_checkbox.inc.php
index 2f3216f6a3..919130a9e2 100644
--- a/etemplate/inc/class.etemplate_widget_checkbox.inc.php
+++ b/etemplate/inc/class.etemplate_widget_checkbox.inc.php
@@ -61,16 +61,19 @@ class etemplate_widget_checkbox extends etemplate_widget
 			$type = $this->type ? $this->type : $this->attrs['type'];
 			$value_attr = $type == 'radio' ? 'set_value' : 'selected_value';
 			// defaults for set and unset values
-			if (!$this->attrs[$value_attr] && !$this->attrs['unselected_value'])
+			$selected_value = true;
+			$unselected_value = false;
+			if (array_key_exists($value_attr, $this->attrs) || array_key_exists('unselected_value',$this->attrs))
 			{
-				$selected_value = true;
-				$unselected_value = false;
-			}
-			else
-			{
-				// Expand any content stuff
-				$selected_value = self::expand_name($this->attrs[$value_attr], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
-				$unselected_value = self::expand_name($this->attrs['unselected_value'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
+				if(array_key_exists($value_attr, $this->attrs))
+				{
+					// Expand any content stuff
+					$selected_value = self::expand_name($this->attrs[$value_attr], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
+				}
+				if(array_key_exists('unselected_value',$this->attrs))
+				{
+					$unselected_value = self::expand_name($this->attrs['unselected_value'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
+				}
 			}
 			if ($type == 'radio')
 			{

From 976c7e55ac0dcd845fb4fe7a62c4b066c2325f9c Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 18 Aug 2014 19:44:37 +0000
Subject: [PATCH 88/94] - Adjust default columns to exclude resolution,
 completion, timesheets, votes and bounties.  They can still be turned on
 manually, just hidden by default. - Set some more default column widths

---
 etemplate/js/et2_extension_nextmatch.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index c36a35be33..0b81a652bd 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -686,6 +686,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
 		if(this.options.settings.selectcols)
 		{
 			columnPreference = this.options.settings.selectcols;
+			negated = false;
 		}
 		if(!this.options.settings.columnselection_pref)
 		{

From 0eb8854eb3167b9bd4c6ef3976ed06c0d4b262b6 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 18 Aug 2014 19:55:54 +0000
Subject: [PATCH 89/94] Add 'None' category option back for addressbook

---
 addressbook/inc/class.addressbook_ui.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index d689bb5332..dc9bf792ca 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -244,7 +244,7 @@ class addressbook_ui extends addressbook_bo
 				$content['nm'] = array_merge($content['nm'],$state);
 			}
 		}
-		$content['nm']['options-cat_id'] = array(lang('none'));
+		$sel_options['cat_id'] = array(array('value' => '', 'label' => lang('all')), array('value' => 0, 'label'=>lang('None')));
 
 		// Delete list action depends on permissions
 		if($this->get_lists(EGW_ACL_EDIT))

From b2544e1b2de869e83f1d8924956ccd985b6d7f3e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 18 Aug 2014 20:53:23 +0000
Subject: [PATCH 90/94] When moving mail, remove any cache for target directory

---
 mail/js/app.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mail/js/app.js b/mail/js/app.js
index d9db89afee..2d657753c5 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -2764,6 +2764,21 @@ app.classes.mail = AppJS.extend(
 		var target = _action.id == 'drop_move_mail' ? _target.iface.id : _action.id.substr(5);
 		var messages = this.mail_getFormData(_senders);
 		if (typeof _allMessagesChecked=='undefined') _allMessagesChecked=false;
+
+		// Directly delete any cache for target
+		if(window.localStorage)
+		{
+			for(var i = 0; i < window.localStorage.length; i++)
+			{
+				var key = window.localStorage.key(i);
+
+				// Find directly by what the key would look like
+				if(key.indexOf('cached_fetch_mail::{"selectedFolder":"'+_target.id+'"') == 0)
+				{
+					window.localStorage.removeItem(key);
+				}
+			}
+		}
 		// TODO: Write move/copy function which cares about doing the same stuff
 		// as the "onNodeSelect" function!
 		messages['all'] = _allMessagesChecked;

From 175d6b7201df1712790518859852199106d059c3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 18 Aug 2014 22:55:54 +0000
Subject: [PATCH 91/94] - Change zoom auto level to better suit projects a day
 or two long - Reset start/end dates when changing data

---
 etemplate/js/et2_widget_gantt.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/etemplate/js/et2_widget_gantt.js b/etemplate/js/et2_widget_gantt.js
index 0ec7abe235..5df067c2ba 100644
--- a/etemplate/js/et2_widget_gantt.js
+++ b/etemplate/js/et2_widget_gantt.js
@@ -236,6 +236,8 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 			data: value.data || [],
 			links: value.links || []
 		};
+		this.gantt.config.start_date = null;
+		this.gantt.config.end_date = null;
 		this.gantt.parse(safe_value);
 
 		// Set some things from the value
@@ -343,8 +345,8 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 			{
 				level = 3;
 			}
-			// More than 3 days
-			else if (difference > 259200)
+			// More than 1 day
+			else if (difference > 86400)
 			{
 				level = 2;
 			}

From de3ff0c2ffe09d069f5afaf364e6c1947be84396 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 19 Aug 2014 07:33:10 +0000
Subject: [PATCH 92/94] Fix css class name typo in mail

---
 mail/templates/default/app.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 4693039b37..346e16a5a4 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -720,6 +720,6 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
 	.et2_button {
 		display: none;
 	}
-	.mailCompose_emailCopy {
+	.mailCompose_copyEmail {
 	}
 }

From c664ae5b65dc26a67be7feadeb06596d78a72e9d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 19 Aug 2014 08:45:41 +0000
Subject: [PATCH 93/94] add pure php connect/login times to profile

---
 mail/profile.php | 67 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/mail/profile.php b/mail/profile.php
index 2da669ef24..8aefa7f959 100644
--- a/mail/profile.php
+++ b/mail/profile.php
@@ -53,12 +53,79 @@ $times = array(
 	'read' => $accounttime - $headertime,
 );
 
+php_times($account, $times);
 horde_times($account, $times);
 mail_times($acc_id, $times);
 
 Header('Content-Type: application/json; charset=utf-8');
 echo json_encode($times, JSON_PRETTY_PRINT);
 
+function php_times($account, array &$times, $prefix='php_')
+{
+	$starttime = microtime(true);
+	switch($account->acc_imap_ssl & ~emailadmin_account::SSL_VERIFY)
+	{
+		case emailadmin_account::SSL_SSL:
+			$schema = 'ssl';
+			break;
+		case emailadmin_account::SSL_TLS:
+			$schema = 'tls';
+			break;
+		case emailadmin_account::SSL_STARTTLS:
+		default:
+			$schema = 'tcp';
+			break;
+	}
+	$error_number = $error_string = null;
+	$stream = stream_socket_client(
+		$schema . '://' . $account->acc_imap_host . ':' . $account->acc_imap_port,
+		$error_number,
+		$error_string,
+		20,
+		STREAM_CLIENT_CONNECT,
+		/* @todo: As of PHP 5.6, TLS connections require valid certs.
+		 * However, this is BC-breaking to this library. For now, keep
+		 * pre-5.6 behavior. */
+		stream_context_create(array(
+			'ssl' => array(
+				'verify_peer' => false,
+				'verify_peer_name' => false
+			)
+		))
+	);
+	$connect_response = fgets($stream);
+
+	// starttls (untested)
+	if ($stream && ($account->acc_imap_ssl & ~emailadmin_account::SSL_VERIFY) == emailadmin_account::SSL_STARTTLS)
+	{
+		fwrite($stream, "10 STARTTLS\r\n");
+		stream_socket_enable_crypto($stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+		$starttls_response = fgets($stream);
+	}
+	stream_set_timeout($stream, 20);
+
+	if (function_exists('stream_set_read_buffer')) {
+		stream_set_read_buffer($stream, 0);
+	}
+	stream_set_write_buffer($stream, 0);
+
+	$connect = microtime(true);
+
+	fwrite($stream, "20 LOGIN $account->acc_imap_username $account->acc_imap_password\r\n");
+	$login_response = fgets($stream);
+	$endtime = microtime(true);
+
+	$times += array(
+		$prefix.'connect' => $connect - $starttime,
+		//$prefix.'connect_response' => $connect_response,
+		$prefix.'login' => $endtime - $starttime,
+		//$prefix.'login_response' => $login_response,
+	);
+
+	fclose($stream);
+	unset($connect_response, $starttls_response, $login_response, $error_number, $error_string);
+}
+
 function mail_times($acc_id, array &$times, $prefix='mail_')
 {
 	global $cache;

From 427956518e70e22868b506b76ce68fcc6bc2a9a5 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 19 Aug 2014 10:10:09 +0000
Subject: [PATCH 94/94] * Etemplate/widget: Introduce video widget. - Add
 ability to play video media/stream

---
 etemplate/js/et2_widget_video.js | 191 +++++++++++++++++++++++++++++++
 etemplate/js/etemplate2.js       |   1 +
 2 files changed, 192 insertions(+)
 create mode 100644 etemplate/js/et2_widget_video.js

diff --git a/etemplate/js/et2_widget_video.js b/etemplate/js/et2_widget_video.js
new file mode 100644
index 0000000000..b9be1a71f0
--- /dev/null
+++ b/etemplate/js/et2_widget_video.js
@@ -0,0 +1,191 @@
+/**
+ * EGroupware eTemplate2 - JS Description object
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @subpackage api
+ * @link http://www.egroupware.org
+ * @author Hadi Nategh <hn[at]stylite.de>
+ * @copyright Stylite AG
+ * @version $Id:$
+ */
+
+"use strict";
+
+/*egw:uses
+	jquery.jquery;
+	et2_core_interfaces;
+	et2_core_baseWidget;
+*/
+
+/**
+ * This widget represents the HTML5 video tag with all its optional attributes 
+ * 
+ * The widget can be created in the following ways:
+ * <code>
+ * var videoTag = et2_createWidget("video", {
+ *			video_src: "../../test.mp4",
+ *			src_type: "video/mp4",
+ *			muted: true,
+ *			autoplay: true,
+ *			controls: true,
+ *			poster: "../../poster.jpg",
+ *			loop: true,
+ *			height: 100,
+ *			width: 200,
+ * });
+ * </code>
+ * Or by adding XET-tag in your template (.xet) file:
+ * <code>
+ * <video [attributes...]/>
+ * </code>
+ */
+
+/**
+ * Class which implements the "video" XET-Tag
+ *
+ * @augments et2_baseWidget
+ */
+var et2_video = et2_baseWidget.extend(et2_IDOMNode,
+{
+	attributes: {
+		"video_src": {
+			"name": "Video",
+			"type": "string",
+			"description": "Source of video to display"
+		},
+		"src_type": {
+			"name": "Source type",
+			"type": "string",
+			"description": "Defines the type the stream source provided"
+		},
+		"muted": {
+			"name": "Audio control",
+			"type": "boolean",
+			"default": false,
+			"description": "Defines that the audio output of the video should be muted"
+		},
+		"autoplay": {
+			"name": "Autoply",
+			"type": "boolean",
+			"default": false,
+			"description": "Defines if Video will start playing as soon as it is ready"
+		},
+		"controls": {
+			"name": "Control buttons",
+			"type": "boolean",
+			"default": false,
+			"description": "Defines if Video controls, play/pause buttons should be displayed"
+		},
+		"poster": {
+			"name": "Video Poster",
+			"type": "string",
+			"default": "",
+			"description": "Specifies an image to be shown while video is loading or before user play it"
+		},
+		loop: {
+			"name": "Video loop",
+			"type": "boolean",
+			"default": false,
+			"description": "Defines if the video should be played repeatedly"
+		}
+	},
+	
+	
+	/**
+	 * Constructor
+	 *
+	 * @memberOf et2_video
+	 */
+	init: function() {
+		this._super.apply(this, arguments);
+		
+		//Create Video tag
+		this.video = jQuery(document.createElement("video"));
+		if (this.options.controls)
+		{
+			this.video.attr("controls",true);
+		}
+		if (this.options.autoplay)
+		{
+			this.video.attr("autoplay",true);
+		}
+		if (this.options.muted)
+		{
+			this.video.attr("muted",true);
+		}
+		if (this.options.video_src)
+		{
+			this.set_src(this.options.video_src);
+		}
+		if (this.options.loop)
+		{
+			this.video.attr("loop",true);
+		}
+		this.setDOMNode(this.video[0]);
+	},
+
+	/**
+	 * Set video src
+	 *
+	 * @param {string} _value url
+	 */
+	set_src: function(_value) {
+		
+		if (_value)
+		{
+			var source  = jQuery(document.createElement('source'))
+					.attr('src',_value)
+					.appendTo(this.video);
+			
+			if (this.options.src_type)
+			{
+				source.attr('type',this.options.src_type);
+			}
+		}
+	},
+	
+	/**
+	 * Set autoplay option for video
+	 * -If autoplay is set, video would be played automatically after the page is loaded
+	 * 
+	 * @param {string} _value true set the autoplay and false not to set
+	 */
+	set_autoplay: function (_value)
+	{
+		if (_value)
+		{
+			this.video.attr("autoplay",_value);
+		}
+	},
+	
+	/**
+	 * Set controls option for video
+	 *
+	 * @param {string} _value true set the autoplay and false not to set
+	 */
+	set_controls: function (_value)
+	{
+		if (_value)
+		{
+			this.video.attr("controls",_value);
+		}
+	},
+	
+	/**
+	 * Set poster attribute in order to specify 
+	 * an image to be shown while video is loading or before user play it
+	 * 
+	 * @param {type} _url
+	 */
+	set_poster: function (_url)
+	{
+		if (_url)
+		{
+			this.video.attr("poster", _url);
+		}
+	}
+	
+});
+
+et2_register_widget(et2_video, ["video"]);
diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index 799495ecd1..9c5afc2ec0 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -51,6 +51,7 @@
 	et2_widget_selectAccount;
 	et2_widget_ajaxSelect;
 	et2_widget_vfs;
+	et2_widget_video;
 	et2_widget_itempicker;
 
 	et2_extension_nextmatch;