From cd7324983b15c0236fec79dd221ce2ed837a4b92 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 15 Sep 2015 16:32:56 +0000
Subject: [PATCH 001/130] Mailvelope backup/restore integration WIP: -
 Implements Mailvelope installation dialog

---
 .../templates/default/pgp_installation.xet    | 29 ++++++++++++--
 phpgwapi/js/jsapi/app_base.js                 | 39 ++++++++++++-------
 2 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/etemplate/templates/default/pgp_installation.xet b/etemplate/templates/default/pgp_installation.xet
index a7cc93e177..9ba6574b03 100644
--- a/etemplate/templates/default/pgp_installation.xet
+++ b/etemplate/templates/default/pgp_installation.xet
@@ -2,9 +2,30 @@
 <!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <overlay>
 	<template id="etemplate.pgp_installation" template="" lang="" group="" version="15.1">
-		<vbox height="300" width="300">
-			<description value="You need to have mailvelope plugin installed on your browser, although, before procceding further, we do recommend you to watch this short video tutorial about how to work with mailvelope plugin."/>
-			<video video_src="webdav.php/home/sysop/Tutorials/20150616_PGP_EN.mp4" controls="true" height="260" width="60%"/>
-		</vbox>
+		<grid height="300" width="450">
+			<columns>
+				<column/>
+			</columns>
+			<rows>
+				<row part="header">
+					<description value="You need to install Mailvelope plugin available for Chrome and Firefox from www.mailvelope.com or by clicking on install button."/>
+				</row>
+				<row>
+					<description value="$row_cont[domain]"/>
+				</row>
+				<row>
+					<description value="Although, before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with EGroupware."/>
+				</row>
+				<row>
+					<video video_src="https://www.egroupware.de/videos/mailvelope_only_EN.mp4" controls="true" height="260" width="60%"/>	
+				</row>
+			</rows>
+		</grid>
+		
+		<styles>
+			video {
+				margin-left: 18%;
+			}
+		</styles>
 	</template>
 </overlay>
diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index 220ed68ea7..72ce142ee3 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -1237,7 +1237,7 @@ var AppJS = Class.extend(
 							}
 						},
 						title: egw.lang('Backup/Restore'),
-						buttons:[{"button_id": 'close',"text": 'Close', id: 'dialog[close]', image: 'check', "default":true}],
+						buttons:[{"button_id": 'close',"text": 'Close', id: 'dialog[close]', image: 'cancelled', "default":true}],
 						value: {
 							content: {
 								menu:_content
@@ -1271,9 +1271,17 @@ var AppJS = Class.extend(
 			this.mailvelopeInstallationOffer();
 		}
 	},
-
+	
+	/**
+	 * Create a dialog and offers installation option for installing mailvelope plugin
+	 * plus it offers a video tutorials to get the user morte familiar with mailvelope
+	 */
 	mailvelopeInstallationOffer: function ()
 	{
+		var buttons = [
+			{"text": 'Install', id: 'install', image: 'check', "default":true},
+			{"text": 'Close', id:'close', image: 'cancelled'}
+		];
 		var dialog = function(_content, _callback)
 		{
 			return et2_createWidget("dialog", {
@@ -1284,7 +1292,7 @@ var AppJS = Class.extend(
 							}
 						},
 						title: egw.lang('PGP Encryption Installation'),
-						buttons: et2_dialog.BUTTONS_YES_NO,
+						buttons: buttons,
 						dialog_type: 'info',
 						value: {
 							content: _content
@@ -1296,20 +1304,23 @@ var AppJS = Class.extend(
 
 			});
 		};
-		var content = [{}];
+		var content = [
+			// Header row should be empty item 0
+			{},
+			{domain:this.egw.lang('Add your domain as "%1" in options to list of email providers and enable API.',
+					'*.'+this._mailvelopeDomain()), video:"test", control:"true"}
+		];
+			
 		dialog(content, function(_button){
-			if (_button == et2_dialog.YES_BUTTON)
+			if (_button == 'install')
 			{
-				if (typeof chrome != 'undefined' && typeof chrome.webstore != 'undefined')
+				if (typeof chrome != 'undefined')
 				{
-					chrome.webstore.install("https://chrome.google.com/webstore/detail/mailvelope/kajibbejlbohfaggdiogboambcijhkke",
-					function(){
-						et2_dialog.alert(lang('Mailvelope addon installation succeded. Now you may configure the options.'));
-						return;
-					},
-					function(){
-						et2_dialog.alert(lang('Mailvelope addon installation faild! Please try agian.'));
-					});
+					// ATM we are not able to trigger mailvelope installation directly
+					// since the installation should be triggered from the extension
+					// owner validate website (mailvelope.com), therefore, we just redirect
+					// user to chrome webstore to install mailvelope from there. 
+					window.open('https://chrome.google.com/webstore/detail/mailvelope/kajibbejlbohfaggdiogboambcijhkke');
 				}
 				else if (typeof InstallTrigger != 'undefined' && InstallTrigger.enabled())
 				{

From 4479cf64c58a7988943f66d498bff38da9820c16 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 15 Sep 2015 16:42:52 +0000
Subject: [PATCH 002/130] Mailvelope backup/restore integration WIP: - Add
 mailvelope installation dialog for mail and infolog

---
 mail/js/app.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 3684a89b43..3e13480721 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4680,9 +4680,7 @@ app.classes.mail = AppJS.extend(
 		{
 			if (typeof mailvelope == 'undefined')
 			{
-				this.egw.message(this.egw.lang('You need to install Mailvelope plugin available for Chrome and Firefox from %1.','<a href="https://www.mailvelope.com/">mailvelope.com</a>')+"\n"+
-					this.egw.lang('Add your domain as "%1" in options to list of email providers and enable API.',
-					'*.'+this._mailvelopeDomain()), 'info');
+				this.mailvelopeInstallationOffer();
 				// switch encrypt button off again
 				this.et2.getWidgetById('composeToolbar')._actionManager.getActionById('pgp').set_checked(false);
 				jQuery('button#composeToolbar-pgp').toggleClass('toolbar_toggled');

From 91750f46c936c3ca00d91e331e661b722791c72a Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 15 Sep 2015 23:59:31 +0000
Subject: [PATCH 003/130] Access dialog - If current app has no special
 support, show general dialog instead of message - Sort apps in add dialog -
 Filter app list (filter2) to all apps for run rights, or only supporting apps
 otherwise

---
 admin/inc/class.admin_acl.inc.php    | 35 ++++++++++++++++++++++++----
 admin/js/app.js                      | 10 ++++++--
 phpgwapi/js/jsapi/egw_preferences.js |  4 ++--
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/admin/inc/class.admin_acl.inc.php b/admin/inc/class.admin_acl.inc.php
index 5eb27d0253..f59745f52e 100644
--- a/admin/inc/class.admin_acl.inc.php
+++ b/admin/inc/class.admin_acl.inc.php
@@ -248,6 +248,34 @@ class admin_acl
 		}
 		//error_log(__METHOD__."(".array2string($query).") returning ".$total);
 
+		// Get supporting or all apps for filter2 depending on filter
+		if($query['filter'] == 'run')
+		{
+			$rows['sel_options']['filter2'] = array(
+				'' => lang('All applications'),
+			)+etemplate_widget_menupopup::app_options('enabled');
+		}
+		else
+		{
+			$rows['sel_options']['filter2'] = array(
+				array('value' => '', 'label' => lang('All applications'))
+			);
+			$apps = $GLOBALS['egw']->hooks->process(array(
+				'location' => 'acl_rights',
+				'owner' => $query['account_id'],
+			), array(), true);
+			foreach($apps as $appname => $rights)
+			{
+				$rows['sel_options']['filter2'][] = array(
+					'value' => $appname,
+					'label' => lang($appname)
+				);
+			}
+			usort($rows['sel_options']['filter2'], function($a,$b) {
+				return strcasecmp($a['label'], $b['label']);
+			});
+		}
+
 		return $total;
 	}
 
@@ -388,12 +416,9 @@ class admin_acl
 				'other' => lang('Access to %1 data by others', $user),
 				'own'   => lang('%1 access to other data', $user),
 				'run'   => lang('%1 run rights for applications', $user),
-			),
-			'filter2' => array(
-				'' => lang('All applications'),
-			)+etemplate_widget_menupopup::app_options('enabled'),
+			)
 		);
-
+		
 		$tpl->exec('admin.admin_acl.index', $content, $sel_options);
 	}
 
diff --git a/admin/js/app.js b/admin/js/app.js
index 5709a92f4e..6f3ebab143 100644
--- a/admin/js/app.js
+++ b/admin/js/app.js
@@ -447,11 +447,17 @@ app.classes.admin = AppJS.extend(
 			else
 			{
 				// Restrict application selectbox to only apps that support ACL
-				sel_options.acl_appname = {};
+				sel_options.acl_appname = [];
 				for(var app in acl_rights)
 				{
-					sel_options.acl_appname[app] = this.egw.lang(app);
+					sel_options.acl_appname.push({value: app, label: this.egw.lang(app)});
 				}
+				// Sort list
+				sel_options.acl_appname.sort(function(a,b) {
+					if(a.label > b.label) return 1;
+					if(a.label < b.label) return -1;
+					return 0;
+				});
 			}
 
 		}
diff --git a/phpgwapi/js/jsapi/egw_preferences.js b/phpgwapi/js/jsapi/egw_preferences.js
index f3d16e1251..36c2332c3b 100644
--- a/phpgwapi/js/jsapi/egw_preferences.js
+++ b/phpgwapi/js/jsapi/egw_preferences.js
@@ -116,7 +116,7 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function() {
 			var current_app = this.app_name();
 			var query = {current_app: current_app};
 			// give warning, if app does not support given type, but all apps link to common prefs, if they dont support prefs themselfs
-			if ($j.isArray(apps) && $j.inArray(current_app, apps) == -1 && name != 'prefs' ||
+			if ($j.isArray(apps) && $j.inArray(current_app, apps) == -1 && (name != 'prefs' && name != 'acl') ||
 				!$j.isArray(apps) && (typeof apps[current_app] == 'undefined' || !apps[current_app]))
 			{
 				egw_message(egw.lang('Not supported by current application!'), 'warning');
@@ -134,7 +134,7 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function() {
 
 					case 'acl':
 						query.menuaction='preferences.preferences_acl.index';
-						query.acl_app=current_app;
+						if ($j.inArray(current_app, apps) != -1) query.acl_app=current_app;
 						egw.open_link(egw.link(url, query), '_blank', '900x450');
 						break;
 

From e276fa10a2939adc6cc683a722e8f121bb1f7d78 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 16 Sep 2015 11:36:51 +0000
Subject: [PATCH 004/130] * Calendar/Filemanager: display warning when clicking
 on an iCal file with more then 1 event, only first one is displayed

---
 calendar/inc/class.calendar_uiforms.inc.php | 12 +++++++++---
 calendar/lang/egw_de.lang                   |  1 +
 calendar/lang/egw_en.lang                   |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index ab86994030..5de19f9b73 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1216,8 +1216,9 @@ class calendar_uiforms extends calendar_ui
 	 *	edit_single int timestamp of single event edited, unset/null otherwise
 	 * @param string $msg ='' msg to display
 	 * @param mixed $link_to_id ='' from or for the link-widget
+	 * @param string $msg_type =null default automatic detect, if it contains "error"
 	 */
-	function edit($event=null,$preserv=null,$msg='',$link_to_id='')
+	function edit($event=null,$preserv=null,$msg='',$link_to_id='',$msg_type=null)
 	{
 		$sel_options = array(
 			'recur_type' => &$this->bo->recur_types,
@@ -1272,7 +1273,7 @@ class calendar_uiforms extends calendar_ui
 			if (!empty($_GET['ical']))
 			{
 				$ical = new calendar_ical();
-				if (!($events = $ical->icaltoegw($_GET['ical'], '', 'utf-8')) || count($events) != 1)
+				if (!($events = $ical->icaltoegw($_GET['ical'], '', 'utf-8')))
 				{
 					error_log(__METHOD__."('$_GET[ical]') error parsing iCal!");
 					$msg = lang('Error: importing the iCal');
@@ -1280,6 +1281,11 @@ class calendar_uiforms extends calendar_ui
 				}
 				else
 				{
+					if (count($events) > 1)
+					{
+						$msg = lang('%1 events in iCal file, only first one imported and displayed!', count($events));
+						$msg_type = 'notice';	// no not hide automatic
+					}
 					// as icaltoegw returns timestamps in server-time, we have to convert them here to user-time
 					$this->bo->db2data($events, 'ts');
 
@@ -1429,9 +1435,9 @@ class calendar_uiforms extends calendar_ui
 			'edit_single' => $preserv['edit_single'],	// need to be in content too, as it is used in the template
 			'tabs'   => $preserv['tabs'],
 			'view' => $view,
-			'msg' => $msg,
 			'query_delete_exceptions' => (int)($event['recur_type'] && $event['recur_exception']),
 		));
+		egw_framework::message($msg, $msg_type);
 		$content['duration'] = $content['end'] - $content['start'];
 		if (isset($this->durations[$content['duration']])) $content['end'] = '';
 
diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang
index 84b65569c5..272c77e7e2 100644
--- a/calendar/lang/egw_de.lang
+++ b/calendar/lang/egw_de.lang
@@ -2,6 +2,7 @@
 %1 days	calendar	de	%1 Tage
 %1 event(s) %2	calendar	de	%1 Termin(e) %2
 %1 event(s) %2, %3 failed because of insufficent rights !!!	calendar	de	%1 Termin(e) %2, %3 wegen fehlender Rechte !!!
+%1 events in ical file, only first one imported and displayed!	calendar	de	%1 Termine in der iCal Datei, nur der erste wurde importiert und angezeigt!
 %1 hours	calendar	de	%1 Stunden
 %1 minutes	calendar	de	%1 Minuten
 %1 participants removed because of missing invite grants	calendar	de	%1 Teilnehmer entfernt wegen fehlender Einladungsrechte
diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang
index edc76a71b0..538584a8a2 100644
--- a/calendar/lang/egw_en.lang
+++ b/calendar/lang/egw_en.lang
@@ -2,6 +2,7 @@
 %1 days	calendar	en	%1 days
 %1 event(s) %2	calendar	en	%1 event(s) %2
 %1 event(s) %2, %3 failed because of insufficent rights !!!	calendar	en	%1 event(s) %2, %3 failed because of insufficient rights!
+%1 events in ical file, only first one imported and displayed!	calendar	en	%1 events in iCal file, only first one imported and displayed!
 %1 hours	calendar	en	%1 hours
 %1 minutes	calendar	en	%1 minutes
 %1 participants removed because of missing invite grants	calendar	en	%1 participants removed because of missing invite grants.

From 383052c51690fe7b3060a19b68e9dd1599051ebb Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 16 Sep 2015 13:32:15 +0000
Subject: [PATCH 005/130] Fix broken sidebox app header refresh caused by
 commit 53643

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

diff --git a/phpgwapi/js/framework/fw_base.js b/phpgwapi/js/framework/fw_base.js
index bb43ea4363..b45691bd26 100644
--- a/phpgwapi/js/framework/fw_base.js
+++ b/phpgwapi/js/framework/fw_base.js
@@ -176,7 +176,7 @@ var fw_base =  Class.extend({
 			!(this.applications[_app.appName].app_refresh) &&
 			_app.browser.iframe == null && _url == _app.browser.currentLocation 
 			// links with load may needs to be reloaded e.g. admin applications global cats
-			&& (!_app.browser.currentLocation.match(/&load=[^&]+/g) && _app == 'admin'))
+			&& !(_app.browser.currentLocation.match(/&load=[^&]+/g) && _app == 'admin'))
 		{
 			// Just do an egw_refresh to avoid a full reload
 			egw_refresh('',_app.appName);

From 36f5364a85f6447a3e8550c7d3d9a9ce613f8e04 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 16 Sep 2015 13:40:00 +0000
Subject: [PATCH 006/130] WIP toggle sidebar menu: - Implement reload icon in a
 better position

---
 pixelegg/css/mobile.css                  | 35 ++++--------------------
 pixelegg/css/pixelegg.css                | 35 ++++--------------------
 pixelegg/less/layout_raster_sidebar.less | 35 +++++++++---------------
 3 files changed, 23 insertions(+), 82 deletions(-)

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 9c3b0d480c..de44759f33 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -4738,33 +4738,6 @@ td.message span.message {
   font-size: 1.4em;
   color: #000000;
   padding-top: .8em;
-  background-image: url(../images/reload.png);
-  background-repeat: no-repeat;
-  background-size: 16px;
-  background-position-x: 74%;
-  background-position-y: 60%;
-  background-position: 74%;
-}
-#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1:active {
-  background-image: url(../images/ajax-loader.gif) !important;
-}
-#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:hover {
-  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-  -webkit-border-top-right-radius: 5px;
-  -webkit-border-bottom-right-radius: 0px;
-  -webkit-border-bottom-left-radius: 0px;
-  -webkit-border-top-left-radius: 27px;
-  -moz-border-radius-topright: 5px;
-  -moz-border-radius-bottomright: 0px;
-  -moz-border-radius-bottomleft: 0px;
-  -moz-border-radius-topleft: 27px;
-  border-top-right-radius: 5px;
-  border-bottom-right-radius: 0px;
-  border-bottom-left-radius: 0px;
-  border-top-left-radius: 27px;
-  /*.background-clip(padding-box);*/
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:active {
   -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -4784,6 +4757,9 @@ td.message span.message {
   border-top-left-radius: 27px;
   /*.background-clip(padding-box);*/
 }
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:hover img {
+  content: url(../images/reload.png);
+}
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:focus {
   background-image: url("../images/ajax-loader.gif");
   background-repeat: no-repeat;
@@ -4803,8 +4779,7 @@ td.message span.message {
   height: 16px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active .egw_fw_ui_ajaxloader {
-  margin-top: -15%;
-  margin-right: 25%;
+  margin-top: -26px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content {
   display: block;
@@ -4997,7 +4972,7 @@ td.message span.message {
   margin-top: 0;
   margin-bottom: -30px;
   float: right;
-  margin-right: 5px;
+  margin-right: -15px;
 }
 #egw_fw_sidebar #egw_fw_toggler span {
   background-color: transparent;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 38af34f725..ed3c6b4b4f 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -4727,33 +4727,6 @@ td.message span.message {
   font-size: 1.4em;
   color: #000000;
   padding-top: .8em;
-  background-image: url(../images/reload.png);
-  background-repeat: no-repeat;
-  background-size: 16px;
-  background-position-x: 74%;
-  background-position-y: 60%;
-  background-position: 74%;
-}
-#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1:active {
-  background-image: url(../images/ajax-loader.gif) !important;
-}
-#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:hover {
-  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-  -webkit-border-top-right-radius: 5px;
-  -webkit-border-bottom-right-radius: 0px;
-  -webkit-border-bottom-left-radius: 0px;
-  -webkit-border-top-left-radius: 27px;
-  -moz-border-radius-topright: 5px;
-  -moz-border-radius-bottomright: 0px;
-  -moz-border-radius-bottomleft: 0px;
-  -moz-border-radius-topleft: 27px;
-  border-top-right-radius: 5px;
-  border-bottom-right-radius: 0px;
-  border-bottom-left-radius: 0px;
-  border-top-left-radius: 27px;
-  /*.background-clip(padding-box);*/
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:active {
   -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -4773,6 +4746,9 @@ td.message span.message {
   border-top-left-radius: 27px;
   /*.background-clip(padding-box);*/
 }
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:hover img {
+  content: url(../images/reload.png);
+}
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:focus {
   background-image: url("../images/ajax-loader.gif");
   background-repeat: no-repeat;
@@ -4792,8 +4768,7 @@ td.message span.message {
   height: 16px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active .egw_fw_ui_ajaxloader {
-  margin-top: -15%;
-  margin-right: 25%;
+  margin-top: -26px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content {
   display: block;
@@ -4986,7 +4961,7 @@ td.message span.message {
   margin-top: 0;
   margin-bottom: -30px;
   float: right;
-  margin-right: 5px;
+  margin-right: -15px;
 }
 #egw_fw_sidebar #egw_fw_toggler span {
   background-color: transparent;
diff --git a/pixelegg/less/layout_raster_sidebar.less b/pixelegg/less/layout_raster_sidebar.less
index 7b4d3d230e..739c2c4e33 100644
--- a/pixelegg/less/layout_raster_sidebar.less
+++ b/pixelegg/less/layout_raster_sidebar.less
@@ -54,11 +54,11 @@
             // DRAG AND DROP
             div.ui-sortable {
 
-                div {
-                    padding: 3px 0 1px 3px;
-                    cursor: pointer;
-                }
-            }
+				div {
+					padding: 3px 0 1px 3px;
+					cursor: pointer;
+				}
+			}
 
 
             //####################################################
@@ -120,23 +120,14 @@
 
                 img {padding-left: 9px; padding-top: 6px; height: 18px;}
 
-                h1 {
-					text-transform: uppercase;
-					font-size: 1.4em;
-					.color_100_gray;
-					padding-top: .8em;
-					background-image: url(../images/reload.png);
-					background-repeat: no-repeat;
-					background-size: 16px;
-					background-position-x: 74%;
-					background-position-y: 60%;
-					background-position: 74%;
-					&:active {background-image: url(../images/ajax-loader.gif) !important;}
-				}
+                h1 {text-transform: uppercase;font-size: 1.4em;.color_100_gray;padding-top: .8em;}
 
-                &:hover {.box_shadow_standard_light_hover; .border_radius ( 5px, 0px, 0px, 27px );}
                 &:active {.box_shadow_standard_light_active; .border_radius ( 5px, 0px, 0px, 27px );}
-
+				&:hover {
+					img {
+						content: url(../images/reload.png);
+					}
+				}
                 &:focus {
                     background-image: url("../images/ajax-loader.gif");
                     background-repeat: no-repeat;
@@ -153,7 +144,7 @@
                     .dimension_width_height_s;
                 }
 
-                .egw_fw_ui_ajaxloader {margin-top: -15%;margin-right: 25%;}
+                .egw_fw_ui_ajaxloader {margin-top: -26px;}
 
             }
 
@@ -349,7 +340,7 @@
 		margin-top: 0;
 		margin-bottom: -30px;
 		float: right;
-		margin-right:5px;
+		margin-right:-15px;
 
 		span {
 			background-color: transparent;

From d3cd05165d9eb4725ec373c5caa90b1134b9bb0b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 16 Sep 2015 14:07:56 +0000
Subject: [PATCH 007/130] Fix mail TO field is not getting focused, and initial
 resize does not work

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

diff --git a/mail/js/app.js b/mail/js/app.js
index 3e13480721..9efa711821 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -245,15 +245,16 @@ app.classes.mail = AppJS.extend(
 				});
 				/*Trigger compose_resizeHandler after the CKEditor is fully loaded*/
 				jQuery('#mail-compose').on ('load',function() {
-					window.setTimeout(function(){that.compose_resizeHandler();}, 300);
+					window.setTimeout(function(){
+						that.compose_fieldExpander();
+					}, 300);
 				});
+				
 				//Resize compose after window resize to not getting scrollbar
 				jQuery(window).on ('resize',function() {
 					that.compose_resizeHandler();
 				});
 
-				this.compose_fieldExpander();
-
 				//Call drag_n_drop initialization for emails on compose
 				this.init_dndCompose();
 

From 5de5c828134ee9cb1d26ffc1738a46cfaf2c0098 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 16 Sep 2015 15:01:52 +0000
Subject: [PATCH 008/130] Mailvelope backup/restore integration WIP: - Add some
 translation

---
 etemplate/templates/default/pgp_installation.xet |  2 +-
 phpgwapi/lang/egw_de.lang                        |  3 +++
 phpgwapi/lang/egw_en.lang                        | 11 +++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/etemplate/templates/default/pgp_installation.xet b/etemplate/templates/default/pgp_installation.xet
index 9ba6574b03..ce748669ed 100644
--- a/etemplate/templates/default/pgp_installation.xet
+++ b/etemplate/templates/default/pgp_installation.xet
@@ -14,7 +14,7 @@
 					<description value="$row_cont[domain]"/>
 				</row>
 				<row>
-					<description value="Although, before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with EGroupware."/>
+					<description value="Before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with EGroupware."/>
 				</row>
 				<row>
 					<video video_src="https://www.egroupware.de/videos/mailvelope_only_EN.mp4" controls="true" height="260" width="60%"/>	
diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang
index f82503f05e..56cc095a75 100644
--- a/phpgwapi/lang/egw_de.lang
+++ b/phpgwapi/lang/egw_de.lang
@@ -52,6 +52,7 @@ add shortcut	common	de	Abkürzung hinzufügen
 add sub	common	de	Untergeordnete hinzufügen
 add user to responsibles	groupdav	de	füge Benutzer zu Verantwortlichen hinzu
 add user to responsibles, removing evtl. previous category user	groupdav	de	füge Benutzer zu Verantwortlichen hinzu, entferne Benutzer der vorherigen Kategorie
+add your domain as "%1" in options to list of email providers and enable api.	common	de	Fügen Sie Ihre Domain als "%1" in Optionen zu der Liste der E-Mail-Anbieter hinzu und schalten sie API ein.
 addressbook	common	de	Adressbuch
 addressbooks to sync in addition to personal addressbook	groupdav	de	Adressbücher die zusätzlich zum persönlichen synchronisiert werden sollen
 admin	common	de	Admin
@@ -110,6 +111,7 @@ bahrain	common	de	BAHRAIN
 bangladesh	common	de	BANGLADESH
 barbados	common	de	BARBADOS
 bcc	common	de	Blindkopie
+before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with egroupware.	common	de	Außerdem empfehlen wir Ihnen dieses kurze Video, bevor Sie mit der Installation starten. Hier wird gezeigt, wie das Mailvelope Plugin zusammen mit EGroupware funktioniert.
 belarus	common	de	BELORUSSLAND (WEISSRUSSLAND)
 belgium	common	de	BELGIEN
 belize	common	de	BELIZE
@@ -938,6 +940,7 @@ you have successfully logged out	common	de	Sie haben sich erfolgreich abgemeldet
 you need to %1set your timezone preference%2.	common	de	Sie müssen %1Ihre Zeitzone in den Einstellungen setzen%2
 you need to add the webserver user '%1' to the group '%2'.	common	de	Sie müssen den Webserver-User '%1' zur Gruppe '%2' hinzufügen.
 you need to be an egroupware administrator to access this functionality!	common	de	Sie müssen ein EGroupware Administrator sein, um auf diese Funktion zuzugreifen!
+you need to install mailvelope plugin available for chrome and firefox from www.mailvelope.com or by clicking on install button.	common	de	Bitte installieren Sie das Mailvelope Plugin, erhältlich für Firefox und Chrome, von www.mailvelope.com oder klicken Sie auf den Button "Installieren".
 you need to select some entries first!	common	de	Sie müssen zuerst einige Datensätze auswählen!
 you need to set enable logging to "%1" to create/update a log.	groupdav	de	Sie müssen logging einschalten auf "%1" setzen damit ein Log angelegt/aktualisiert wird.
 you will not be able to send or receive encrypted mails before completing that step!	common	de	Sie werden KEINE verschlüsselten Mail sender oder empfangen können, bevor Sie nicht diesen Schritt beendet haben!
diff --git a/phpgwapi/lang/egw_en.lang b/phpgwapi/lang/egw_en.lang
index 7c99e7ddb3..800c657154 100644
--- a/phpgwapi/lang/egw_en.lang
+++ b/phpgwapi/lang/egw_en.lang
@@ -85,6 +85,7 @@ apply the action on the whole query, not only the shown entries	common	en	Apply
 april	common	en	April
 are you sure you want to delete these entries ?	common	en	Are you sure you want to delete these entries?
 are you sure you want to delete this entry ?	common	en	Are you sure you want to delete this entry?
+are you sure, you would like to delete the backup key?	common	en	Are you sure, you would like to delete the backup key?
 argentina	common	en	ARGENTINA
 armenia	common	en	ARMENIA
 aruba	common	en	ARUBA
@@ -103,6 +104,7 @@ azerbaijan	common	en	AZERBAIJAN
 back	common	en	Back
 back to user login	common	en	Back to user login
 background color:	common	en	Background color:
+backup/restore	common	en	Backup/Restore
 backupdir '%1' is not writeable by the webserver	common	en	Backupdir '%1' is not writeable by the web server.
 bad login or password	common	en	Bad login or password.
 bahamas	common	en	BAHAMAS
@@ -110,6 +112,7 @@ bahrain	common	en	BAHRAIN
 bangladesh	common	en	BANGLADESH
 barbados	common	en	BARBADOS
 bcc	common	en	Bcc
+before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with egroupware.	common	en	Before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with EGroupware.
 belarus	common	en	BELARUS
 belgium	common	en	BELGIUM
 belize	common	en	BELIZE
@@ -230,6 +233,7 @@ default height for the windows	common	en	Default height for the windows
 default width for the windows	common	en	Default width for the windows
 del	common	en	Del
 delete	common	en	Delete
+delete backup key	common	en	Delete backup key
 delete category	common	en	Delete category
 delete file	common	en	Delete file
 delete row	common	en	Delete row
@@ -498,6 +502,8 @@ macau	common	en	MACAU
 macedonia, the former yugoslav republic of	common	en	MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF
 madagascar	common	en	MADAGASCAR
 mail domain, eg. "%1"	common	en	Mail domain, eg. "%1"
+mailvelope addon installation faild! please try agian.	common	en	Mailvelope addon installation faild! Please try agian.
+mailvelope addon installation succeded. now you may configure the options.	common	en	Mailvelope addon installation succeded. Now you may configure the options.
 main category	common	en	Main category
 main screen	common	en	Main screen
 maintainer	common	en	Maintainer
@@ -636,6 +642,8 @@ personal	common	en	Personal
 peru	common	en	PERU
 pg down	common	en	Pg down
 pg up	common	en	Pg up
+pgp encryption	common	en	PGP Encryption
+pgp encryption installation	common	en	PGP Encryption Installation
 philippines	common	en	PHILIPPINES
 phone number	common	en	Phone number
 phpgwapi	common	en	EGroupware API
@@ -826,6 +834,7 @@ text color:	common	en	Text color:
 thailand	common	en	THAILAND
 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	en	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
 the following applications require upgrades	common	en	The following applications require upgrades
+the key backup has been deleted.	common	en	The key backup has been deleted.
 the mail server returned	common	en	The mail server returned
 there already is a system-user with this name. user's should not have the same name as a systemuser	common	en	There already is a system user with this name. Please, select another name.
 they will be sub-folders in users home (%1 attribute).	common	en	They will be sub-folders in users home (%1 attribute).
@@ -900,6 +909,7 @@ view	common	en	View
 virgin islands, british	common	en	VIRGIN ISLANDS, BRITISH
 virgin islands, u.s.	common	en	VIRGIN ISLANDS, U.S.
 wallis and futuna	common	en	WALLIS AND FUTUNA
+was not able to delete key backup because %1	common	en	Was not able to delete key backup because %1
 wednesday	common	en	Wednesday
 welcome	common	en	Welcome
 western european	common	en	Western european
@@ -938,6 +948,7 @@ you have successfully logged out	common	en	You have successfully logged out.
 you need to %1set your timezone preference%2.	common	en	You need to %1set your time zone preference%2.
 you need to add the webserver user '%1' to the group '%2'.	common	en	You need to add the web server user '%1' to the group '%2'.
 you need to be an egroupware administrator to access this functionality!	common	en	You need to be an EGroupware administrator to access this functionality!
+you need to install mailvelope plugin available for chrome and firefox from www.mailvelope.com or by clicking on install button.	common	en	You need to install Mailvelope plugin available for Chrome and Firefox from www.mailvelope.com or by clicking on install button.
 you need to select some entries first!	common	en	You need to select some entries first!
 you need to set enable logging to "%1" to create/update a log.	groupdav	en	You need to set enable logging to "%1" to create/update a log.
 you will not be able to send or receive encrypted mails before completing that step!	common	en	You will NOT be able to send or receive encrypted mails before completing that step!

From bd21376303d92e7499e5a533f0c27377972ff089 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 16 Sep 2015 15:32:33 +0000
Subject: [PATCH 009/130] Mailvelope backup/restore integration WIP: - Add &
 Fix some more translation

---
 phpgwapi/js/jsapi/app_base.js |  4 ++--
 phpgwapi/lang/egw_de.lang     | 11 ++++++++++-
 phpgwapi/lang/egw_en.lang     |  5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index 72ce142ee3..03b8a23712 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -1153,9 +1153,9 @@ var AppJS = Class.extend(
 			if (_button_id == et2_dialog.YES_BUTTON )
 			{
 				self._mailvelopeBackupFileOperator(undefined, 'DELETE', function(){
-					self.egw.message(self.egw.lang('The key backup has been deleted.'));
+					self.egw.message(self.egw.lang('The backup key has been deleted.'));
 				}, function(_err){
-					self.egw.message(self.egw.lang('Was not able to delete key backup because %1',_err));
+					self.egw.message(self.egw.lang('Was not able to delete the backup key because %1',_err));
 				});
 			}
 		},
diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang
index 56cc095a75..949f5c5500 100644
--- a/phpgwapi/lang/egw_de.lang
+++ b/phpgwapi/lang/egw_de.lang
@@ -86,6 +86,7 @@ apply the action on the whole query, not only the shown entries	common	de	Befehl
 april	common	de	April
 are you sure you want to delete these entries ?	common	de	Sind Sie sicher, daß Sie diese Einträge löschen möchten?
 are you sure you want to delete this entry ?	common	de	Sind Sie sicher, daß Sie diesen Eintrag löschen möchten?
+are you sure, you would like to delete the backup key?	common	de	Sind Sie sicher, dass Sie den Backup Schlüssel löschen möchten?
 argentina	common	de	ARGENTINIEN
 armenia	common	de	ARMENIEN
 aruba	common	de	ARUBA
@@ -104,6 +105,7 @@ azerbaijan	common	de	ASERBAIDSCHAN
 back	common	de	Zurück
 back to user login	common	de	Zurück zur Benutzer Anmeldung
 background color:	common	de	Hintergrund Farbe:
+backup/restore	common	de	Backup/Wiederherstellung
 backupdir '%1' is not writeable by the webserver	common	de	Der Webserver hat keine Schreibrechte auf das Backupverzeichnis '%1' .
 bad login or password	common	de	Falscher Benutzername oder Passwort
 bahamas	common	de	BAHAMAS
@@ -111,7 +113,7 @@ bahrain	common	de	BAHRAIN
 bangladesh	common	de	BANGLADESH
 barbados	common	de	BARBADOS
 bcc	common	de	Blindkopie
-before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with egroupware.	common	de	Außerdem empfehlen wir Ihnen dieses kurze Video, bevor Sie mit der Installation starten. Hier wird gezeigt, wie das Mailvelope Plugin zusammen mit EGroupware funktioniert.
+before proceeding further, we do highly recommend you to watch this short video, to see how mailvelope plugin works with egroupware.	common	de	Bevor Sie mit der Installation starten, empfehlen wir Ihnen dieses kurze Video. Hier wird gezeigt, wie das Mailvelope Plugin zusammen mit EGroupware funktioniert.
 belarus	common	de	BELORUSSLAND (WEISSRUSSLAND)
 belgium	common	de	BELGIEN
 belize	common	de	BELIZE
@@ -232,6 +234,7 @@ default height for the windows	common	de	Vorgabewert für Höhe des Fensters
 default width for the windows	common	de	Vorgabewert für Breite des Fensters
 del	common	de	Ent
 delete	common	de	Löschen
+delete backup key	common	de	Backup Schlüssel löschen
 delete category	common	de	Kategorie entfernen
 delete file	common	de	Datei löschen
 delete row	common	de	Zeile löschen
@@ -500,6 +503,8 @@ macau	common	de	MACAU
 macedonia, the former yugoslav republic of	common	de	MAZEDONIEN, FRÜHERE JUGOSLAVISCHE REPUBLIK
 madagascar	common	de	MADAGASCAR
 mail domain, eg. "%1"	common	de	Mail Domain, z.B. "%1"
+mailvelope addon installation faild! please try agian.	common	de	Installation des Mailvelope Add-on gescheitert! Bitte versuchen Sie es erneut.
+mailvelope addon installation succeded. now you may configure the options.	common	de	Installation des Mailvelope Add-on erfolgreich. Jetzt können Sie die Optionen konfigurieren.
 main category	common	de	Hauptkategorie
 main screen	common	de	Startseite
 maintainer	common	de	Maintainer
@@ -638,6 +643,8 @@ personal	common	de	persönlich
 peru	common	de	PERU
 pg down	common	de	Pg down
 pg up	common	de	Pg up
+pgp encryption	common	de	PGP Verschlüsselung
+pgp encryption installation	common	de	Installation der PGP Verschlüsselung
 philippines	common	de	PHILIPPINEN
 phone number	common	de	Telefonnummer
 phpgwapi	common	de	EGroupware API
@@ -826,6 +833,7 @@ tajikistan	common	de	TAJIKISTAN
 tanzania, united republic of	common	de	TANZANIA, VEREINIGTE REPUBLIK
 text color:	common	de	Textfarbe:
 thailand	common	de	THAILAND
+the backup key has been deleted.	common	de	Der Backup-Schlüssel wurde gelöscht.
 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
@@ -902,6 +910,7 @@ view	common	de	Anzeigen
 virgin islands, british	common	de	VIRGIN ISLANDS, BRITISH
 virgin islands, u.s.	common	de	VIRGIN ISLANDS, U.S.
 wallis and futuna	common	de	WALLIS AND FUTUNA
+was not able to delete the backup key because %1	common	de	Es war nicht möglich das Backup-Schlüssel zu löschen weil...
 wednesday	common	de	Mittwoch
 welcome	common	de	Willkommen
 western european	common	de	Westeuropäisch
diff --git a/phpgwapi/lang/egw_en.lang b/phpgwapi/lang/egw_en.lang
index 800c657154..c9e8b3c820 100644
--- a/phpgwapi/lang/egw_en.lang
+++ b/phpgwapi/lang/egw_en.lang
@@ -52,6 +52,7 @@ add shortcut	common	en	Add shortcut
 add sub	common	en	Add sub
 add user to responsibles	groupdav	en	add user to responsibles
 add user to responsibles, removing evtl. previous category user	groupdav	en	add user to responsibles, removing evtl. previous category user
+add your domain as "%1" in options to list of email providers and enable api.	common	en	Add your domain as "%1" in options to list of email providers and enable API.
 addressbook	common	en	Address Book
 addressbooks to sync in addition to personal addressbook	groupdav	en	Addressbooks to sync in addition to personal addressbook
 admin	common	en	Admin
@@ -832,9 +833,9 @@ tajikistan	common	en	TAJIKISTAN
 tanzania, united republic of	common	en	TANZANIA, UNITED REPUBLIC OF
 text color:	common	en	Text color:
 thailand	common	en	THAILAND
+the backup key has been deleted.	common	en	The backup key has been deleted.
 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	en	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
 the following applications require upgrades	common	en	The following applications require upgrades
-the key backup has been deleted.	common	en	The key backup has been deleted.
 the mail server returned	common	en	The mail server returned
 there already is a system-user with this name. user's should not have the same name as a systemuser	common	en	There already is a system user with this name. Please, select another name.
 they will be sub-folders in users home (%1 attribute).	common	en	They will be sub-folders in users home (%1 attribute).
@@ -909,7 +910,7 @@ view	common	en	View
 virgin islands, british	common	en	VIRGIN ISLANDS, BRITISH
 virgin islands, u.s.	common	en	VIRGIN ISLANDS, U.S.
 wallis and futuna	common	en	WALLIS AND FUTUNA
-was not able to delete key backup because %1	common	en	Was not able to delete key backup because %1
+was not able to delete the backup key because %1	common	en	Was not able to delete the backup key because %1
 wednesday	common	en	Wednesday
 welcome	common	en	Welcome
 western european	common	en	Western european

From bc9a99a2af77e3dd398e7dfec90a2fdf885f97f2 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 16 Sep 2015 15:46:17 +0000
Subject: [PATCH 010/130] Avoid error in some cases where there is no readonly
 array manager yet

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

diff --git a/etemplate/js/et2_core_widget.js b/etemplate/js/et2_core_widget.js
index f3b3a78636..46e6b38997 100644
--- a/etemplate/js/et2_core_widget.js
+++ b/etemplate/js/et2_core_widget.js
@@ -641,10 +641,10 @@ var et2_widget = ClassWithAttributes.extend(
 		// determine which constructor is used
 		var _nodeName = attributes["type"] = _node.getAttribute("type") ?
 			_node.getAttribute("type") : _node.nodeName.toLowerCase();
-		var readonly = attributes["readonly"] =
+		var readonly = attributes["readonly"] = this.getArrayMgr("readonlys") ?
 			this.getArrayMgr("readonlys").isReadOnly(
 				_node.getAttribute("id"), _node.getAttribute("readonly"),
-				typeof this.readonly !== 'undefined' ? this.readonly : this.options.readonly );
+				typeof this.readonly !== 'undefined' ? this.readonly : this.options.readonly ) : false;
 
 		// Check to see if modifications change type
 		var modifications = this.getArrayMgr("modifications");

From b963fff0c0260803bfa46de63af0006bfd7649cf Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 16 Sep 2015 15:47:49 +0000
Subject: [PATCH 011/130] Fix bug where default columns disappeared and all
 columns were shown when there's no user preference

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

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 5634b4836a..966d47fb8c 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -330,7 +330,6 @@ class addressbook_ui extends addressbook_bo
 		if (isset($org_view))
 		{
 			$content['nm']['org_view'] = $org_view;
-			$content['nm']['default_cols'] = '';
 		}
 
 		$content['nm']['actions'] = $this->get_actions($content['nm']['col_filter']['tid'], $content['nm']['org_view']);

From 1ed0befddf54eef8da73db9af1e6d4db076ea1eb Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 16 Sep 2015 16:00:35 +0000
Subject: [PATCH 012/130] Add some new actions into mail preview and display
 toolbars

---
 mail/inc/class.mail_ui.inc.php | 86 ++++++++++++++++++++++------------
 1 file changed, 55 insertions(+), 31 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 4a38e31731..1bab930a6f 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1463,7 +1463,8 @@ class mail_ui
 	function get_toolbar_actions()
 	{
 		$actions = $this->get_actions();
-		$arrActions = array('composeasnew','reply','reply_all','forward','flagged','delete','print','infolog','tracker','calendar','save','view');
+		$arrActions = array('composeasnew', 'reply', 'reply_all', 'forward', 'flagged', 'delete', 'print',
+			'infolog', 'tracker', 'calendar', 'save', 'view', 'read', 'label1',	'label2', 'label3',	'label4');
 		foreach( $arrActions as &$act)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$act.'->'.array2string($actions[$act]));
@@ -1482,6 +1483,29 @@ class mail_ui
 				case 'flagged':
 					$actionsenabled[$act]= $actions['mark']['children'][$act];
 					break;
+				case 'read':
+					$actionsenabled[$act]= $actions['mark']['children'][$act];
+					break;
+				case 'label1':
+					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('important');
+					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					break;
+				case 'label2':
+					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('job');
+					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					break;
+				case 'label3':
+					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('personal');
+					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					break;
+				case 'label4':
+					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('to do');
+					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					break;
+				case 'label5':
+					$actions['mark']['children']['setLabel']['children'][$act]['caption'] = lang('later');
+					$actionsenabled[$act]= $actions['mark']['children']['setLabel']['children'][$act];
+					break;
 				default:
 					if (isset($actions[$act])) $actionsenabled[$act]=$actions[$act];
 			}
@@ -1848,35 +1872,7 @@ class mail_ui
 				);
 			}
 		}
-		$actionsenabled = self::get_actions();
-		unset($actionsenabled['open']);
-		unset($actionsenabled['mark']['children']['setLabel']);
-		unset($actionsenabled['mark']['children']['read']);
-		unset($actionsenabled['mark']['children']['unread']);
-		unset($actionsenabled['mark']['children']['undelete']);
-		unset($actionsenabled['mark']['children']['readall']);
-		unset($actionsenabled['moveto']);
-		unset($actionsenabled['drag_mail']);
-		$actionsenabled['mark']['children']['flagged']=array(
-			'group' => $actionsenabled['mark']['children']['flagged']['group'],
-			'caption' => 'Flagged',
-			'icon' => 'unread_flagged_small',
-			'onExecute' => 'javaScript:app.mail.mail_flag',
-		);
-		$actionsenabled['mark']['children']['unflagged']=array(
-			'group' => $actionsenabled['mark']['children']['flagged']['group'],
-			'caption' => 'Unflagged',
-			'icon' => 'read_flagged_small',
-			'onExecute' => 'javaScript:app.mail.mail_flag',
-		);
-		$actionsenabled['tracker']['toolbarDefault'] = true;
-		$actionsenabled['mark']['toolbarDefault'] = true;
-		$actionsenabled['forward']['toolbarDefault'] = true;
-		$cAN = $actionsenabled['composeasnew'];
-		unset($actionsenabled['composeasnew']);
-		$actionsenabled = array_reverse($actionsenabled,true);
-		$actionsenabled['composeasnew']=$cAN;
-		$actionsenabled = array_reverse($actionsenabled,true);
+		$actionsenabled = $this->getDisplayToolbarActions();
 		$content['displayToolbaractions'] = json_encode($actionsenabled);
 		if (empty($subject)) $subject = lang('no subject');
 		$content['msg'] = (is_array($error_msg)?implode("<br>",$error_msg):$error_msg);
@@ -1914,7 +1910,35 @@ class mail_ui
 
 		$etpl->exec('mail.mail_ui.displayMessage',$content,$sel_options,$readonlys,$preserv,2);
 	}
-
+	
+	/**
+	 * Build actions for display toolbar
+	 */
+	function getDisplayToolbarActions ()
+	{
+		$actions = $this->get_toolbar_actions();
+		$actions['mark']['children']['flagged']=array(
+			'group' => $actions['mark']['children']['flagged']['group'],
+			'caption' => 'Flagged',
+			'icon' => 'unread_flagged_small',
+			'onExecute' => 'javaScript:app.mail.mail_flag',
+		);
+		$actions['mark']['children']['unflagged']=array(
+			'group' => $actions['mark']['children']['flagged']['group'],
+			'caption' => 'Unflagged',
+			'icon' => 'read_flagged_small',
+			'onExecute' => 'javaScript:app.mail.mail_flag',
+		);
+		$actions['tracker']['toolbarDefault'] = true;
+		$actions['forward']['toolbarDefault'] = true;
+		$compose = $actions['composeasnew'];
+		unset($actions['composeasnew']);
+		$actions = array_reverse($actions,true);
+		$actions['composeasnew']= $compose;
+		$actions = array_reverse($actions,true);
+		return $actions;
+	}
+	
 	/**
 	 * createAttachmentBlock
 	 * helper function to create the attachment block/table

From 5f19cc95fc56e88b539060c9658a97e4d74f500d Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 17 Sep 2015 09:52:58 +0000
Subject: [PATCH 013/130] Mailvelope WIP: - Add mailvelope keepAttachments
 option

---
 infolog/js/app.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/infolog/js/app.js b/infolog/js/app.js
index 4cd314ebf6..59b6b15d0d 100644
--- a/infolog/js/app.js
+++ b/infolog/js/app.js
@@ -63,7 +63,7 @@ app.classes.infolog = AppJS.extend(
 				// Enable decrypt on hover
 				if(this.egw.user('apps').stylite)
 				{
-					this._get_stylite(function() {this.mailvelopeAvailable(function() {app.stylite.decrypt_hover(nm);})});
+					this._get_stylite(function() {this.mailvelopeAvailable(function() {app.stylite.decrypt_hover(nm);});});
 				}
 				break;
 			case 'infolog.edit.print':
@@ -320,7 +320,7 @@ app.classes.infolog = AppJS.extend(
 
 			}
 		};
-		var confirmDeleteDialog = et2_dialog.show_dialog(callbackDeleteDialog, this.egw.lang("Do you really want to DELETE this Rule"),this.egw.lang("Delete"), {},et2_dialog.BUTTONS_YES_NO_CANCEL, et2_dialog.WARNING_MESSAGE);
+		et2_dialog.show_dialog(callbackDeleteDialog, this.egw.lang("Do you really want to DELETE this Rule"),this.egw.lang("Delete"), {},et2_dialog.BUTTONS_YES_NO_CANCEL, et2_dialog.WARNING_MESSAGE);
 	},
 
 	/**
@@ -672,6 +672,10 @@ app.classes.infolog = AppJS.extend(
 
 	/**
 	 * Make sure stylite javascript is loaded, and call the given callback when it is
+	 * 
+	 * @param {function} callback
+	 * @param {object} attrs
+	 * 
 	 */
 	_get_stylite: function(callback,attrs)
 	{
@@ -734,7 +738,8 @@ app.classes.infolog = AppJS.extend(
 					quotedMailHeader: start_pgp ? options.predefinedText.slice(0, start_pgp).replace(/> /mg, '').trim()+"\n" : "",
 					quotedMail: options.predefinedText.slice(start_pgp, end_pgp+this.end_pgp_message.length+1).replace(/> /mg, ''),
 					quotedMailIndent: start_pgp != 0,
-					predefinedText: options.predefinedText.slice(end_pgp+this.end_pgp_message.length+1).replace(/^> \s*/m,'')
+					predefinedText: options.predefinedText.slice(end_pgp+this.end_pgp_message.length+1).replace(/^> \s*/m,''),
+					keepAttachments:true
 				};
 			}
 		}
@@ -743,11 +748,11 @@ app.classes.infolog = AppJS.extend(
 		{
 			var $info_des_dom = jQuery(self.et2.getWidgetById('info_des').getDOMNode());
 			$info_des_dom.children('iframe').height($info_des_dom.height());
-			$info_des_dom.children('span').hide();
+					$info_des_dom.children('span').hide();
 
-			//Trigger print action
+					//Trigger print action
 			self.infolog_print_preview();
-		},
+				},
 		function(_err)
 		{
 			self.egw.message(_err, 'error');

From 3b596f061e5a1c66010c02b65c8577e136e7b097 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 18 Sep 2015 07:18:58 +0000
Subject: [PATCH 014/130] UCS lowercases email when storing

---
 .../inc/class.addressbook_univention.inc.php       | 14 ++++++++++++++
 phpgwapi/inc/class.accounts_univention.inc.php     |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/addressbook/inc/class.addressbook_univention.inc.php b/addressbook/inc/class.addressbook_univention.inc.php
index 9ccfb7b516..347300d54b 100644
--- a/addressbook/inc/class.addressbook_univention.inc.php
+++ b/addressbook/inc/class.addressbook_univention.inc.php
@@ -23,4 +23,18 @@ class addressbook_univention extends addressbook_ldap
 		);
 		parent::__construct($ldap_config, $ds);
 	}
+
+	/**
+	 * saves the content of data to the db
+	 *
+	 * @param array $keys if given $keys are copied to data before saveing => allows a save as
+	 * @return int 0 on success and errno != 0 else
+	 */
+	function save($keys=null)
+	{
+		// UCS lowercases email when storing
+		$keys['email'] = strtolower(!empty($keys['email']) ? $keys['email'] : $this->data['email']);
+
+		return parent::save($keys);
+	}
 }
diff --git a/phpgwapi/inc/class.accounts_univention.inc.php b/phpgwapi/inc/class.accounts_univention.inc.php
index dbd7dc1828..a45549d3ee 100644
--- a/phpgwapi/inc/class.accounts_univention.inc.php
+++ b/phpgwapi/inc/class.accounts_univention.inc.php
@@ -47,6 +47,9 @@ class accounts_univention extends accounts_ldap
 	 */
 	function save(&$data)
 	{
+		// UCS lowercases email when storing
+		$data['account_email'] = strtolower($data['account_email']);
+
 		if (self::available())
 		{
 			$config = $this->frontend->config && $this->frontend->config['ldap_context'] ?

From d591b6f3ae0d9ef03380b76948672565c59e5916 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 18 Sep 2015 08:46:55 +0000
Subject: [PATCH 015/130] introduce config to be able to trigger a closer look
 on folders located in shared and others namespace, as some servers do not
 return them by default on root-level-queries; Default is set to NO

---
 mail/lang/egw_de.lang             |  2 ++
 mail/lang/egw_en.lang             |  2 ++
 mail/templates/default/config.tpl | 11 +++++++++++
 3 files changed, 15 insertions(+)

diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index efc481720e..2747fe35b8 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -165,6 +165,7 @@ error:could not save the acl! because some names are empty!	mail	de	Fehler: Zugr
 esync will fail without a working email configuration!	mail	de	eSync steht Ihnen nicht zur Verfügung, weil kein gültiges Mailkonto eingestellt wurde!
 event details follow	mail	de	Details zum Termin folgen
 everyone	mail	de	Alle Anwender
+examine namespace to retrieve folders in others and shared	mail	de	Untersuche Namespace für Mail-Ordner in den Bereichen OTHERS and SHARED
 extended	mail	de	Erweitert
 extra sent folders	mail	de	Anzeigeschema Gesendet Ordner
 failed to delete %1	mail	de	Löschen von %1 fehlgeschlagen
@@ -312,6 +313,7 @@ notify when new mails arrive in these folders	mail	de	Benachrichtigung, sobald n
 on	mail	de	am
 one address is not valid	mail	de	Eine Adresse ist ungültig
 only makes sense, if you transport password through a different channel / outside of this mail to recipients!	mail	de	Macht nur dann Sinn, wenn das Passwort auf einem andren Weg, außerhalb dieser Mail, den Empfängern mitgeteilt wird!
+only needed for some servers, that do not return all folders on root level queries to retrieve all folders for that level	mail	de	wird nur für bestimmte Server gebraucht, die NICHT alle Ordner für Root-Knoten-Abfragen zurückgeben (damit wird in diesem Fall explizit auf Ordner in den Prefixes der Namespaces geprüft)
 only one window	mail	de	nur ein einziges Fenster
 only send message, do not copy a version of the message to the configured sent folder	mail	de	Versende Nachricht, kopiere sie nicht in den konfigurierten Gesendet Ordner
 open in html mode	mail	de	In HTML Modus öffnen
diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang
index d2cab6d623..4ec6f56e7f 100644
--- a/mail/lang/egw_en.lang
+++ b/mail/lang/egw_en.lang
@@ -165,6 +165,7 @@ error:could not save the acl! because some names are empty!	mail	en	Error:Could
 esync will fail without a working email configuration!	mail	en	eSync will FAIL without a working eMail configuration!
 event details follow	mail	en	Event Details follow
 everyone	mail	en	Everyone
+examine namespace to retrieve folders in others and shared	mail	en Examine Namespace to retrieve Folders in OTHERS and SHARED
 extended	mail	en	Extended
 extra sent folders	mail	en	Extra sent folders
 failed to delete %1	mail	en	Failed to delete %1
@@ -312,6 +313,7 @@ notify when new mails arrive in these folders	mail	en	notify when new mails arri
 on	mail	en	on
 one address is not valid	mail	en	One address is not valid
 only makes sense, if you transport password through a different channel / outside of this mail to recipients!	mail	en	Only makes sense, if you transport password through a different channel / outside of this mail to recipients!
+only needed for some servers, that do not return all folders on root level queries to retrieve all folders for that level	mail	en	only needed for some servers, that do not return all folders on root level queries to retrieve all folders for that level
 only one window	mail	en	only one window
 only send message, do not copy a version of the message to the configured sent folder	mail	en	only send message, do not copy a version of the message to the configured sent folder
 open in html mode	mail	en	Open in HTML mode
diff --git a/mail/templates/default/config.tpl b/mail/templates/default/config.tpl
index 69e256b072..51bfeef039 100755
--- a/mail/templates/default/config.tpl
+++ b/mail/templates/default/config.tpl
@@ -13,6 +13,17 @@
    <tr class="th">
 	   <td colspan="2"><b>{lang_Deny_certain_groups_access_to_following_features}</b></td>
    </tr>
+   <tr class="row_off">
+    <td> <b>{lang_examine_namespace_to_retrieve_folders_in_others_and_shared}</b><br/>
+	{lang_only_needed_for_some_servers,_that_do_not_return_all_folders_on_root_level_queries_to_retrieve_all_folders_for_that_level}
+	</td>
+    <td>
+     <select name="newsettings[examineNamespace]">
+      <option value=""{selected_examineNamespace_False}>{lang_No}</option>
+      <option value="True"{selected_examineNamespace_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
    <tr class="row_on">
 	<td>
 	 <b>{lang_Create_new_account}</b>

From b333a0c0ad7f00f57a2cce0b87712b1d4164b5c4 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 18 Sep 2015 12:09:59 +0000
Subject: [PATCH 016/130] Add some styling for calendar action in mail

---
 mail/templates/pixelegg/app.css  | 36 +++++++++++++++++++++++---------
 mail/templates/pixelegg/app.less | 14 +++++++++----
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index e493190a7b..9538a4a3cc 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1163,7 +1163,8 @@ body {
 }
 #mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:hover,
 #mail-compose #mail-compose_composeToolbar button#composeToolbar-to_tracker:hover,
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:hover {
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:hover,
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:hover {
   background: none;
 }
 #mail-compose table.et2_grid {
@@ -1389,7 +1390,10 @@ body {
 #mail-display mail-display_displayToolbar button[id*="toolbar-infolog"]:active,
 #mail-display .et2_toolbar button[id*="toolbar-tracker"]:active,
 #mail-display #mail-display_toolbar button[id*="toolbar-tracker"]:active,
-#mail-display mail-display_displayToolbar button[id*="toolbar-tracker"]:active {
+#mail-display mail-display_displayToolbar button[id*="toolbar-tracker"]:active,
+#mail-display .et2_toolbar button[id*="toolbar-calendar"]:active,
+#mail-display #mail-display_toolbar button[id*="toolbar-calendar"]:active,
+#mail-display mail-display_displayToolbar button[id*="toolbar-calendar"]:active {
   background-color: .background_color_15_gray;
 }
 #mail-display .et2_toolbar span.ui-state-default,
@@ -1577,7 +1581,10 @@ body {
 #mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-infolog"]:hover,
 #mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-tracker"]:hover,
 #mail-display #mail-display_toolbar #toolbar-actionlist button[id*="toolbar-tracker"]:hover,
-#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-tracker"]:hover {
+#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-tracker"]:hover,
+#mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-calendar"]:hover,
+#mail-display #mail-display_toolbar #toolbar-actionlist button[id*="toolbar-calendar"]:hover,
+#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-calendar"]:hover {
   background-color: #ffc200;
 }
 #mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-infolog"]:active,
@@ -1585,7 +1592,10 @@ body {
 #mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-infolog"]:active,
 #mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-tracker"]:active,
 #mail-display #mail-display_toolbar #toolbar-actionlist button[id*="toolbar-tracker"]:active,
-#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-tracker"]:active {
+#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-tracker"]:active,
+#mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-calendar"]:active,
+#mail-display #mail-display_toolbar #toolbar-actionlist button[id*="toolbar-calendar"]:active,
+#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-calendar"]:active {
   background-color: .background_color_15_gray;
 }
 #mail-display .mailDisplayAttachments {
@@ -2383,7 +2393,8 @@ input[type=button] {
   background-color: #ae1d00;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:focus,
-#mail-index_toolbar button[id*="toolbar-tracker"]:focus {
+#mail-index_toolbar button[id*="toolbar-tracker"]:focus,
+#mail-index_toolbar button[id*="toolbar-calendar"]:focus {
   background-color: #ffc200;
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
@@ -2395,7 +2406,8 @@ input[type=button] {
   background-repeat: repeat-x;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:focus img[src$="svg"],
-#mail-index_toolbar button[id*="toolbar-tracker"]:focus img[src$="svg"] {
+#mail-index_toolbar button[id*="toolbar-tracker"]:focus img[src$="svg"],
+#mail-index_toolbar button[id*="toolbar-calendar"]:focus img[src$="svg"] {
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
   background-image: -ms-linear-gradient(top, #ffc200, #ffc200);
@@ -2407,7 +2419,8 @@ input[type=button] {
   background-color: #ffc200;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:hover,
-#mail-index_toolbar button[id*="toolbar-tracker"]:hover {
+#mail-index_toolbar button[id*="toolbar-tracker"]:hover,
+#mail-index_toolbar button[id*="toolbar-calendar"]:hover {
   background-color: #ffc200;
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
@@ -2419,7 +2432,8 @@ input[type=button] {
   background-repeat: repeat-x;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:hover img[src$="svg"],
-#mail-index_toolbar button[id*="toolbar-tracker"]:hover img[src$="svg"] {
+#mail-index_toolbar button[id*="toolbar-tracker"]:hover img[src$="svg"],
+#mail-index_toolbar button[id*="toolbar-calendar"]:hover img[src$="svg"] {
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
   background-image: -ms-linear-gradient(top, #ffc200, #ffc200);
@@ -2431,7 +2445,8 @@ input[type=button] {
   background-color: #ffc200;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:active,
-#mail-index_toolbar button[id*="toolbar-tracker"]:active {
+#mail-index_toolbar button[id*="toolbar-tracker"]:active,
+#mail-index_toolbar button[id*="toolbar-calendar"]:active {
   background-color: #ffc200;
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
@@ -2443,7 +2458,8 @@ input[type=button] {
   background-repeat: repeat-x;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:active img[src$="svg"],
-#mail-index_toolbar button[id*="toolbar-tracker"]:active img[src$="svg"] {
+#mail-index_toolbar button[id*="toolbar-tracker"]:active img[src$="svg"],
+#mail-index_toolbar button[id*="toolbar-calendar"]:active img[src$="svg"] {
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
   background-image: -ms-linear-gradient(top, #ffc200, #ffc200);
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index dbd8103be6..9d82ed3d24 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -378,7 +378,10 @@ body {
             &:disabled {background-color: @color_disabled !important;}
 
         }
-		button#composeToolbar-to_infolog:hover, button#composeToolbar-to_tracker:hover, button#composeToolbar-disposition:hover {
+		button#composeToolbar-to_infolog:hover,
+		button#composeToolbar-to_tracker:hover,
+		button#composeToolbar-disposition:hover,
+		button#composeToolbar-to_calendar:hover {
 			background: none;
 		}
     } // Toolbar Ende
@@ -549,7 +552,8 @@ div.mailUploadSection {
             }
 
             button[id*="toolbar-infolog"],
-            button[id*="toolbar-tracker"]{
+            button[id*="toolbar-tracker"],
+			button[id*="toolbar-calendar"]{
                 &:active {background-color: .background_color_15_gray;}
             }
 
@@ -695,7 +699,8 @@ div.mailUploadSection {
                     }
 
                     button[id*="toolbar-infolog"],
-                    button[id*="toolbar-tracker"]{
+                    button[id*="toolbar-tracker"],
+					button[id*="toolbar-calendar"]{
                         &:hover {background-color: @egw_color_1_a;}
                         &:active {background-color: .background_color_15_gray;}
                     }
@@ -1531,7 +1536,8 @@ input[type=button] {
             }
 
             button[id*="toolbar-infolog"],
-            button[id*="toolbar-tracker"]{
+            button[id*="toolbar-tracker"],
+			button[id*="toolbar-calendar"]{
                                 &:focus {
                     background-color: @egw_color_1_a;
                     .gradient_vertical (@egw_color_1_a, @egw_color_1_a);

From 3f5107c4cbd07fe49a6ea618fe3ded5cdd198b50 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 18 Sep 2015 13:14:46 +0000
Subject: [PATCH 017/130] Add some more styling for calendar action in mail

---
 mail/templates/pixelegg/app.css  |  6 +++---
 mail/templates/pixelegg/app.less | 15 ++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 9538a4a3cc..07e1725093 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1133,8 +1133,8 @@ body {
   /*background-color: @gray-0;*/
   /*.gradient_thead;*/
 }
-#mail-compose .et2_toolbar button.toolbar_toggled {
-  background-color: #189800;
+#mail-compose .et2_toolbar button.toolbar_toggled:hover {
+  background-color: white !important;
 }
 #mail-compose #mail-compose_composeToolbar button#composeToolbar-send {
   height: 24px;
@@ -1165,7 +1165,7 @@ body {
 #mail-compose #mail-compose_composeToolbar button#composeToolbar-to_tracker:hover,
 #mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:hover,
 #mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:hover {
-  background: none;
+  background-color: #ffc200;
 }
 #mail-compose table.et2_grid {
   display: inline-block;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 9d82ed3d24..8a399d662a 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -347,14 +347,11 @@ body {
 
     // ##################################
     //	Toolbar
-.et2_toolbar button.toolbar_toggled {
-    background-color: @color_positive_action;
-}
-
-
-
-
-
+	.et2_toolbar button.toolbar_toggled {
+		&:hover{
+			background-color: white !important;
+		}
+	}
 
 	#mail-compose_composeToolbar{
 
@@ -382,7 +379,7 @@ body {
 		button#composeToolbar-to_tracker:hover,
 		button#composeToolbar-disposition:hover,
 		button#composeToolbar-to_calendar:hover {
-			background: none;
+			background-color: @egw_color_1_a;;
 		}
     } // Toolbar Ende
 

From 01ec6d040643eaf95b41dd86c3120cb173a99863 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 18 Sep 2015 13:32:51 +0000
Subject: [PATCH 018/130] A hack for toolbar widget to get fixed existing
 toolbar preferences and keep working with new actions

---
 etemplate/js/et2_widget_toolbar.js | 121 +++++++++++++++++++++++------
 1 file changed, 96 insertions(+), 25 deletions(-)

diff --git a/etemplate/js/et2_widget_toolbar.js b/etemplate/js/et2_widget_toolbar.js
index 92553ba2e1..e51768e53c 100644
--- a/etemplate/js/et2_widget_toolbar.js
+++ b/etemplate/js/et2_widget_toolbar.js
@@ -80,7 +80,7 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 		this.dropdowns = {};
 		this.preference = {};
 		
-		this._build_menu(this.default_toolbar);
+		this._build_menu(this.default_toolbar, true);
 	},
 
 	destroy: function() {
@@ -94,13 +94,61 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 		this.actionbox.empty().remove();
 		this.actionlist.empty().remove();
 	},
-
+	
+	/**
+	 * Fix function in order to fix toolbar preferences with the new preference structure
+	 * @param {action object} _action
+	 * @todo ** SEE IMPORTANT TODO **
+	 */
+	_fix_preference: function (_action)
+	{
+		
+		// ** IMPORTANT TODO: This switch case should be removed for new release **
+		// This is an ugly hack but we need to add this switch becuase to update and fix
+		// current users toolbar preferences with the new structure which is:
+		// - All actions should be stored in preference
+		// - Actions inside menu set as true
+		// - Actions outside menu set as false
+		// - if an action gets added to toolbar it would be undefined in
+		//  the preference which we need to consider to add it to the preference
+		//  according to its toolbarDefault option.
+		if (this.dom_id === 'mail-display_displayToolbar' || this.dom_id === 'mail-index_toolbar')
+		{
+			switch (_action.id)
+			{
+				// Actions newly added to mail index and display toolbar
+				case 'read':
+				case 'label1':
+				case 'label2':
+				case 'label3':
+				case 'label4':
+				case 'label5':	
+					this.set_prefered(_action.id, !_action.toolbarDefault);
+					break;
+				default:
+					// Fix structure and add the actions not the preference
+					// into the preference with value false, as they're already
+					// outside of the menu.
+					this.set_prefered(_action.id, false);
+			}
+		}
+		else
+		{
+			//** IMPORTANT TODO: This line needs to stay and be fixed with !toolbarDefault after the if condition
+			// has been removed.
+			this.set_prefered(_action.id, false/*!toolbarDefault*/);
+		}
+	},
+	
 	/**
 	 * Go through actions and build buttons for the toolbar
 	 *
 	 * @param {Object} actions egw-actions to build menu from
+	 * @param {boolean} isDefault setting isDefault with true will
+	 *  avoid actions get into the preferences, for instandce, first
+	 *  time toolbar_default actions initialization.
 	 */
-	_build_menu: function(actions)
+	_build_menu: function(actions, isDefault)
 	{
 		// Clear existing
 		this.div.empty();
@@ -114,13 +162,28 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 		if (pref && !jQuery.isArray(pref)) this.preference = pref;
 			
 		//Set the default actions for the first time
-		if (typeof pref === 'undefined')
+		if (typeof pref === 'undefined' && !isDefault)
 		{
 			for (var name in actions)
 			{
-				if (!actions[name].toolbarDefault &&
-						(typeof actions[name].children === 'undefined' || !this.options.flat_list))
-					this.set_prefered(actions[name].id,'add');
+				if ((typeof actions[name].children === 'undefined' || !this.options.flat_list) && actions[name].id)
+				{
+					this.set_prefered(actions[name].id,!actions[name].toolbarDefault);
+				}
+			}
+		}
+		else if(!isDefault)
+		{
+			for (var name in actions)
+			{
+				// Check if the action is not in the preference, means it's an new added action
+				// therefore it needs to be added to the preference with taking its toolbarDefault
+				// option into account.
+				if ((typeof actions[name].children === 'undefined' || !this.options.flat_list)
+						&& typeof pref[name] === 'undefined')
+				{
+					this._fix_preference(actions[name]);
+				}
 			}
 		}
 
@@ -158,8 +221,13 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 			}
 			return totalCount;
 		};
-
-		this.countActions = countActions(actions) - Object.keys(this.preference).length;
+		var menuLen = 0;
+		for (var key in this.preference)
+		{
+			if (this.preference[key]) menuLen++;
+		}
+	
+		this.countActions = countActions(actions) - menuLen;
 
 		var last_group = false;
 		var last_group_id = false;
@@ -206,11 +274,22 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 						if (that.flat_list)
 						{
 							childaction = root.children[id];
-							if (typeof pref === 'undefined')
+							if (typeof pref === 'undefined' && !isDefault)
 							{
 								if (!childaction.toolbarDefault)
 								{
-									that.set_prefered(childaction.id,'add');
+									that.set_prefered(childaction.id,true);
+								}
+								else
+								{
+									that.set_prefered(childaction.id,false);
+								}
+							}
+							else if(!isDefault)
+							{
+								if (typeof pref[childaction.id] === 'undefined')
+								{
+									that._fix_preference(childaction);
 								}
 							}
 							if (typeof root.children[id].group !== 'undefined' &&
@@ -322,7 +401,7 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 		toolbox.children().droppable({
 			accept:toolbar,
 			drop:function (event, ui) {
-					that.set_prefered(ui.draggable.attr('id').replace(that.id+'-',''),"add");
+					that.set_prefered(ui.draggable.attr('id').replace(that.id+'-',''),true);
 					ui.draggable.appendTo(menulist);
 					if (that.actionlist.find(".ui-draggable").length == 0)
 					{
@@ -336,7 +415,7 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 		this.actionlist.droppable({
 			tolerance:"pointer",
 			drop:function (event,ui) {
-				that.set_prefered(ui.draggable.attr('id').replace(that.id+'-',''),"remove");
+				that.set_prefered(ui.draggable.attr('id').replace(that.id+'-',''),false);
 				ui.draggable.appendTo(that.actionlist);
 				that._build_menu(actions);
 			}
@@ -370,21 +449,13 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 	 * Add/Or remove an action from prefence
 	 *
 	 * @param {string} _action name of the action which needs to be stored in pereference
-	 * @param {string} _do if set to "add" add the action to preference and "remove" remove one from preference
+	 * @param {boolean} _state if set to true action will be set to actionbox, false will set it to actionlist
 	 *
 	 */
-	set_prefered: function(_action,_do)
+	set_prefered: function(_action,_state)
 	{
-		switch(_do)
-		{
-			case "add":
-				this.preference[_action] = true;
-				egw.set_preference(this.egw().getAppName(),this.dom_id,this.preference);
-				break;
-			case "remove":
-				delete this.preference[_action];
-				egw.set_preference(this.egw().getAppName(),this.dom_id,this.preference);
-		}
+		this.preference[_action] = _state;
+		egw.set_preference(this.egw().getAppName(),this.dom_id,this.preference);
 	},
 
 	/**

From a4c7d64a4cd5a5b20696bb0205a045db8d4caf43 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 18 Sep 2015 13:39:53 +0000
Subject: [PATCH 019/130] Add another action into mail toolbar

---
 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 1bab930a6f..f26ce64340 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1464,7 +1464,7 @@ class mail_ui
 	{
 		$actions = $this->get_actions();
 		$arrActions = array('composeasnew', 'reply', 'reply_all', 'forward', 'flagged', 'delete', 'print',
-			'infolog', 'tracker', 'calendar', 'save', 'view', 'read', 'label1',	'label2', 'label3',	'label4');
+			'infolog', 'tracker', 'calendar', 'save', 'view', 'read', 'label1',	'label2', 'label3',	'label4', 'label5');
 		foreach( $arrActions as &$act)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$act.'->'.array2string($actions[$act]));

From 0f0728316de50e9392f655d17f2891b80baca683 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 18 Sep 2015 15:53:20 +0000
Subject: [PATCH 020/130] support themes on application level:
 $app/templates/$template/app-$theme.css

---
 phpgwapi/inc/class.egw_framework.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index ac7aaac469..2e9c40a5d3 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -1397,7 +1397,8 @@ abstract class egw_framework
 			self::includeCSS($theme_css);
 
 			// search for app specific css file, so it can customize the theme
-			self::includeCSS($GLOBALS['egw_info']['flags']['currentapp'], 'app');
+			self::includeCSS($GLOBALS['egw_info']['flags']['currentapp'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
+				self::includeCSS($GLOBALS['egw_info']['flags']['currentapp'], 'app');
 
 			// sending print css last, so it can overwrite anything
 			$print_css = $this->template_dir.'/print.css';

From 220d5b8ed4fd44bebfd5fa49c01fd42ae6d27333 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 21 Sep 2015 14:04:48 +0000
Subject: [PATCH 021/130] Fix mail actions update for nm context menu, preview
 and display toolbar

---
 mail/inc/class.mail_ui.inc.php |   6 +-
 mail/js/app.js                 | 248 +++++++++++++++++----------------
 2 files changed, 134 insertions(+), 120 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index f26ce64340..a9745f56d5 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -4337,7 +4337,11 @@ class mail_ui
 		if ($_sendJsonResponse)
 		{
 			$response = egw_json_response::get();
-			if ((isset($_messageList['all']) && $_messageList['all']) || ($query['filter'] && ($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false)))
+			if (isset($_messageList['msg']) && $_messageList['popup'])
+			{
+				$response->call('egw.refresh',lang('flagged %1 message as %2 in %3',$_messageList['msg'],lang($_flag),$folder),'mail', $_messageList['msg'], 'update');
+			}
+			else 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 9efa711821..feb79dbdb3 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1987,144 +1987,154 @@ app.classes.mail = AppJS.extend(
 	 */
 	mail_callFlagMessages: function(_action, _elems, _allMessagesChecked)
 	{
-		var do_nmactions = true;
-		var msg;
-		var ftree;
-		var _folder;
-		if (typeof _allMessagesChecked=='undefined') _allMessagesChecked=false;
-		if (_action.id=='read')
+		/**
+		 * vars
+		 */
+		var folder = '',
+			tree = {},
+			formData = {},
+			data = {
+				msg: [this.et2.getArrayMgr("content").getEntry('mail_id')] || '',
+				all: _allMessagesChecked || false,
+				popup: egw(window).is_popup() || false,
+				activeFilters: _action.id == 'readall'? false : this.mail_getActiveFilters(_action)
+			},
+			rowClass = _action.id;
+	
+		if (typeof _elems === 'undefined' || _elems.length == 0)
 		{
-			ftree = this.et2.getWidgetById(this.nm_index+'[foldertree]');
-			var _foldernode = ftree.getSelectedNode();
-			_folder = _foldernode.id;
-		}
-		if (typeof _elems == 'undefined'|| _elems.length==0)
-		{
-			do_nmactions = false;//indicates that this action is probably a popup?
-			if (this.et2.getArrayMgr("content").getEntry('mail_id'))
+			if (this.mail_isMainWindow && this.mail_currentlyFocussed)
 			{
-				msg = {};
-				msg['msg'] = [this.et2.getArrayMgr('content').getEntry('mail_id') || ''];
-			}
-			if ((typeof _elems == 'undefined'|| _elems.length==0) && this.mail_isMainWindow)
-			{
-				if (this.mail_currentlyFocussed)
-				{
-					msg = {};
-					msg['msg'] = [this.mail_currentlyFocussed];
-					_elems = msg;
-					do_nmactions = true;// is triggered from preview
-				}
+				data.msg = [this.mail_currentlyFocussed];
+				_elems = data;
+				data.msg = this.mail_getFormData(_elems).msg;
 			}
 		}
-
-		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';
-		else if (_action.id=='label4') classToProcess='labelfour';
-		else if (_action.id=='label5') classToProcess='labelfive';
-
-		if (do_nmactions)
+		else // action called by contextmenu
 		{
-			msg = this.mail_getFormData(_elems);
-			msg['all'] = _allMessagesChecked;
-			if (msg['all']=='cancel') return false;
-			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
+			data.msg = this.mail_getFormData(_elems).msg;
+		}
+		switch (_action.id)
+		{
+			case 'read':
+				rowClass = 'seen';
+				if (data.popup)
 				{
-					var labels = ['labelone','labeltwo','labelthree','labelfour','labelfive'];
-					for (var i=0; i<labels.length; i++)	this.mail_removeRowClass(_elems,labels[i]);
-					this.mail_flagMessages(_action.id,msg,(do_nmactions?false:true));
+					tree = opener.etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById(this.nm_index+'[foldertree]');
 				}
 				else
 				{
-					this.mail_removeRowClass(_elems,_action.id.substring(2));
-					this.mail_setRowClass(_elems,_action.id);
-					this.mail_flagMessages(_action.id,msg,(do_nmactions?false:true));
+					tree = this.et2.getWidgetById(this.nm_index+'[foldertree]');
 				}
-			}
-			else if (_action.id=='readall')
+				folder = tree.getSelectedNode().id;
+				break;
+			case 'readall':
+				rowClass = 'seen';
+				break;
+			case 'label1':
+				rowClass = 'labelone';
+				break;
+			case 'label2':
+				rowClass = 'labeltwo';
+				break;
+			case 'label3':
+				rowClass = 'labelthree';
+				break;
+			case 'label4':
+				rowClass = 'labelfour';
+				break;
+			case 'label5':
+				rowClass = 'labelfive';
+				break;
+			default:
+				break;	
+		}
+		jQuery(data).extend({},data, formData);
+		if (data['all']=='cancel') return false;
+
+		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
 			{
-				this.mail_flagMessages('read',msg,(do_nmactions?false:true));
+				var labels = ['labelone','labeltwo','labelthree','labelfour','labelfive'];
+				for (var i=0; i<labels.length; i++)	this.mail_removeRowClass(_elems,labels[i]);
+				this.mail_flagMessages(_action.id,data);
 			}
 			else
 			{
-				var msg_set = {msg:[]};
-				var msg_unset = {msg:[]};
-				var dataElem;
-				var flags;
-				var classes = '';
-				for (var i=0; i<msg.msg.length; i++)
-				{
-					dataElem = egw.dataGetUIDdata(msg.msg[i]);
-					if(typeof dataElem.data.flags == 'undefined')
-					{
-						dataElem.data.flags = {};
-					}
-					flags = dataElem.data.flags;
-					classes = dataElem.data['class'] || "";
-					classes = classes.split(' ');
-					// since we toggle we need to unset the ones already set, and set the ones not set
-					// flags is data, UI is done by class, so update both
-					// Flags are there or not, class names are flag or 'un'+flag
-					if(classes.indexOf(classToProcess) >= 0)
-					{
-						classes.splice(classes.indexOf(classToProcess),1);
-					}
-					if(classes.indexOf('un' + classToProcess) >= 0)
-					{
-						classes.splice(classes.indexOf('un' + classToProcess),1);
-					}
-					if (flags[_action.id])
-					{
-						msg_unset['msg'].push(msg.msg[i]);
-						classes.push('un'+classToProcess);
-						delete flags[_action.id];
-					}
-					else
-					{
-						msg_set['msg'].push(msg.msg[i]);
-						flags[_action.id] = _action.id;
-						classes.push(classToProcess);
-					}
-
-					// Update cache & call callbacks - updates list
-					dataElem.data['class']  = classes.join(' ');
-					egw.dataStoreUID(msg.msg[i],dataElem.data);
-
-					//Refresh the nm rows after we told dataComponent about all changes, since the dataComponent doesn't talk to nm, we need to do it manually
-					this.updateFilter_data(msg.msg[i], _action.id, msg.activeFilters);
-				}
-
-				// Notify server of changes
-				if (msg_unset['msg'] && msg_unset['msg'].length)
-				{
-					if (!msg['all']) this.mail_flagMessages('un'+_action.id,msg_unset);
-				}
-				if (msg_set['msg'] && msg_set['msg'].length)
-				{
-					if (!msg['all']) this.mail_flagMessages(_action.id,msg_set);
-				}
-				//server must do the toggle, as we apply to ALL, not only the visible
-				if (msg['all']) this.mail_flagMessages(_action.id,msg);
-				// No further update needed, only in case of read, the counters should be refreshed
-				if (_action.id=='read') this.mail_refreshFolderStatus(_folder,'thisfolderonly',false,true);
-				return;
+				this.mail_removeRowClass(_elems,_action.id.substring(2));
+				this.mail_setRowClass(_elems,_action.id);
+				this.mail_flagMessages(_action.id,data);
 			}
 		}
+		else if (_action.id=='readall')
+		{
+			this.mail_flagMessages('read',data);
+		}
 		else
 		{
-			this.mail_flagMessages(_action.id,msg,(do_nmactions?false:true));
+			var msg_set = {msg:[]};
+			var msg_unset = {msg:[]};
+			var dataElem;
+			var flags;
+			var classes = '';
+			for (var i=0; i<data.msg.length; i++)
+			{
+				dataElem = egw.dataGetUIDdata(data.msg[i]);
+				if(typeof dataElem.data.flags == 'undefined')
+				{
+					dataElem.data.flags = {};
+				}
+				flags = dataElem.data.flags;
+				classes = dataElem.data['class'] || "";
+				classes = classes.split(' ');
+				// since we toggle we need to unset the ones already set, and set the ones not set
+				// flags is data, UI is done by class, so update both
+				// Flags are there or not, class names are flag or 'un'+flag
+				if(classes.indexOf(rowClass) >= 0)
+				{
+					classes.splice(classes.indexOf(rowClass),1);
+				}
+				if(classes.indexOf('un' + rowClass) >= 0)
+				{
+					classes.splice(classes.indexOf('un' + rowClass),1);
+				}
+				if (flags[_action.id])
+				{
+					msg_unset['msg'].push(data.msg[i]);
+					classes.push('un'+rowClass);
+					delete flags[_action.id];
+				}
+				else
+				{
+					msg_set['msg'].push(data.msg[i]);
+					flags[_action.id] = _action.id;
+					classes.push(rowClass);
+				}
+
+				// Update cache & call callbacks - updates list
+				dataElem.data['class']  = classes.join(' ');
+				egw.dataStoreUID(data.msg[i],dataElem.data);
+
+				//Refresh the nm rows after we told dataComponent about all changes, since the dataComponent doesn't talk to nm, we need to do it manually
+				this.updateFilter_data(data.msg[i], _action.id, data.activeFilters);
+			}
+
+			// Notify server of changes
+			if (msg_unset['msg'] && msg_unset['msg'].length)
+			{
+				if (!data['all']) this.mail_flagMessages('un'+_action.id,msg_unset);
+			}
+			if (msg_set['msg'] && msg_set['msg'].length)
+			{
+				if (!data['all']) this.mail_flagMessages(_action.id,msg_set);
+			}
+			//server must do the toggle, as we apply to ALL, not only the visible
+			if (data['all']) this.mail_flagMessages(_action.id,data);
+			// No further update needed, only in case of read, the counters should be refreshed
+			if (_action.id=='read') this.mail_refreshFolderStatus(folder,'thisfolderonly',false,true);
+			return;
 		}
-		// only refresh counter. not grid as the ajaxmethod is called asyncronously
-		// on flagging, only seen/unseen has effect on counterdisplay
-		if (_action.id=='read' || _action.id=='readall') this.mail_refreshFolderStatus(_folder,'thisfolderonly',false,true);
-		//this.mail_refreshFolderStatus();
 	},
 
 	/**

From 2806cd06c1050452e13e904d103fe81ff7de86cc Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Sep 2015 15:41:56 +0000
Subject: [PATCH 022/130] Make planner headers look like links

---
 calendar/js/et2_widget_planner.js     | 10 +++++-----
 calendar/js/et2_widget_planner_row.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/calendar/js/et2_widget_planner.js b/calendar/js/et2_widget_planner.js
index 9d770c07ff..e281620539 100644
--- a/calendar/js/et2_widget_planner.js
+++ b/calendar/js/et2_widget_planner.js
@@ -745,7 +745,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 			this._scroll_button('right', next_month) +
 			this._scroll_button('last', next_year);
 
-		content += '<div class="calendar_plannerMonthScale th" style="left: 0; width: 100%;">'+
+		content += '<div class="calendar_plannerMonthScale th et2_link" style="left: 0; width: 100%;">'+
 				title+"</div>";
 		content += "</div>";		// end of plannerScale
 
@@ -829,7 +829,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 			{
 				title = '&nbsp;';
 			}
-			content += '<div class="calendar_plannerMonthScale et2_clickable" data-date="'+t.toJSON()+ '"'+// data-planner_days='+days_in_month+
+			content += '<div class="calendar_plannerMonthScale et2_clickable et2_link" data-date="'+t.toJSON()+ '"'+// data-planner_days='+days_in_month+
 				' style="left: '+left+'%; width: '+(day_width*days_in_month)+'%;">'+
 				title+"</div>";
 		}
@@ -877,7 +877,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 				title = this._scroll_button('left',left.toJSON()) + title + this._scroll_button('right',right.toJSON());
 			}
 			
-			content += '<div class="calendar_plannerWeekScale et2_clickable" data-date=\'' + state + '\' style="left: '+left+'%; width: '+week_width+'%;">'+title+"</div>";
+			content += '<div class="calendar_plannerWeekScale et2_clickable et2_link" data-date=\'' + state + '\' style="left: '+left+'%; width: '+week_width+'%;">'+title+"</div>";
 		}
 		content += "</div>";		// end of plannerScale
 
@@ -937,7 +937,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 					title += this._scroll_button('right',next.toJSON());
 				}
 			}
-			content += '<div class="calendar_plannerDayScale et2_clickable '+ day_class+
+			content += '<div class="calendar_plannerDayScale et2_clickable et2_link '+ day_class+
 				'" data-date=\'' + state +'\' style="left: '+left+'%; width: '+day_width+'%;"'+
 				(holidays ? ' title="'+holidays.join(',')+'"' : '')+'>'+title+"</div>\n";
 		}
@@ -982,7 +982,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 		{
 			var title = date(egw.preference('timeformat','calendar') == 12 ? 'ha' : 'H',t);
 
-			content += '<div class="calendar_plannerHourScale" data-date="' + t.toJSON() +'" style="left: '+left+'%; width: '+(cell_width)+'%;">'+title+"</div>";
+			content += '<div class="calendar_plannerHourScale et2_link" data-date="' + t.toJSON() +'" style="left: '+left+'%; width: '+(cell_width)+'%;">'+title+"</div>";
 			t.setHours(t.getHours()+decr);
 		}
 		content += "</div>";		// end of plannerScale
diff --git a/calendar/js/et2_widget_planner_row.js b/calendar/js/et2_widget_planner_row.js
index 8ce2f9415b..bba1318f80 100644
--- a/calendar/js/et2_widget_planner_row.js
+++ b/calendar/js/et2_widget_planner_row.js
@@ -128,7 +128,7 @@ var et2_calendar_planner_row = et2_valueWidget.extend([et2_IDetachedDOM],
 		if(this._parent.options.group_by === 'month')
 		{
 			this.title.attr('data-date', this.options.start_date.toJSON());
-			this.title.addClass('et2_clickable');
+			this.title.addClass('et2_clickable et2_link');
 		}
 		else
 		{

From 06fb7f72b24757e6e47b95e4cdcd6b94c94ddf07 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Sep 2015 17:14:39 +0000
Subject: [PATCH 023/130] After changing the template and it's loaded, refresh.

Fixes a bug where new users did not see the results in the new view the first time (not caused by template caching though)
---
 filemanager/js/app.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index 1141456fcf..1f6f0c7a6f 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -725,7 +725,17 @@ app.classes.filemanager = AppJS.extend(
 		nm.activeFilters.view = view;
 
 		// Change template to match
-		nm.set_template(view == nm.controller.VIEW_ROW ? 'filemanager.index.rows' : 'filemanager.tile');
+		var template = view == nm.controller.VIEW_ROW ? 'filemanager.index.rows' : 'filemanager.tile';
+		nm.set_template(template);
+
+		// Wait for template to load, then refresh
+		template = nm.getWidgetById(template);
+		if(template && template.loading)
+		{
+			template.loading.done(function() {
+				nm.applyFilters({view: view});
+			})
+		}
 	},
 
 	/**

From d18a0578b17bb8f273c005642ea556bc45c508dc Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Sep 2015 17:58:40 +0000
Subject: [PATCH 024/130] Use importexport's more robust username parsing to
 try to avoid missing usernames.

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

diff --git a/calendar/inc/class.calendar_import_csv.inc.php b/calendar/inc/class.calendar_import_csv.inc.php
index beffaacef2..82f22f3820 100644
--- a/calendar/inc/class.calendar_import_csv.inc.php
+++ b/calendar/inc/class.calendar_import_csv.inc.php
@@ -110,7 +110,7 @@ class calendar_import_csv extends importexport_basic_import_csv  {
 
 				// Search for direct account name, then user in accounts first
 				$search = "\"$name\"";
-				$id = $GLOBALS['egw']->accounts->name2id($name, 'account_fullname');
+				$id = importexport_helper_functions::account_name2id($name);
 				if(!$id) {
 					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1));
 					if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];

From 8e657aeb0e3495ca31b589bc15d7383f0d969c41 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Sep 2015 19:43:36 +0000
Subject: [PATCH 025/130] Do not die if select custom field is not fully set up

---
 admin/inc/class.customfields.inc.php       | 1 +
 etemplate/js/et2_extension_customfields.js | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin/inc/class.customfields.inc.php b/admin/inc/class.customfields.inc.php
index 70ec40fdd0..0e468c1c44 100644
--- a/admin/inc/class.customfields.inc.php
+++ b/admin/inc/class.customfields.inc.php
@@ -68,6 +68,7 @@ class customfields
 	 * @var Description of the options or value format for each cf_type
 	 */
 	public static $type_option_help = array(
+		'search'	=> 'set get_rows, get_title and id_field, or use @path to read options from a file in EGroupware directory',
 		'select'	=> 'each value is a line like id[=label], or use @path to read options from a file in EGroupware directory',
 		'radio'		=> 'each value is a line like id[=label], or use @path to read options from a file in EGroupware directory',
 		'button'	=> 'each value is a line like label=[javascript]'
diff --git a/etemplate/js/et2_extension_customfields.js b/etemplate/js/et2_extension_customfields.js
index 1c3bdc2baa..deb4cd4f57 100644
--- a/etemplate/js/et2_extension_customfields.js
+++ b/etemplate/js/et2_extension_customfields.js
@@ -438,11 +438,14 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
 	},
 	_setup_ajax_select: function(field_name, field, attrs) {
 		var attributes = ['get_rows','get_title','id_field','template'];
-		for(var i = 0; i < attributes.length; i++)
+		if(field.values)
 		{
-			if(typeof field.values[attributes[i]] !== 'undefined')
+			for(var i = 0; i < attributes.length; i++)
 			{
-				attrs[attributes[i]] = field.values[attributes[i]];
+				if(typeof field.values[attributes[i]] !== 'undefined')
+				{
+					attrs[attributes[i]] = field.values[attributes[i]];
+				}
 			}
 		}
 		return true;

From 0f6c23a5e0ef93866169168918ea553bf989f017 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Sep 2015 20:03:33 +0000
Subject: [PATCH 026/130] If business email cannot be parsed, continue to home
 email.

Fixes bug where contacts with only personal email address were not shown in taglist-email
---
 mail/inc/class.mail_compose.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index dd84a204db..0d2be223d0 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -3324,7 +3324,7 @@ class mail_compose
 					$_rfcAddr=$rfcAddr->first();
 					if (!$_rfcAddr->valid)
 					{
-						break; // skip address if we encounter an error here
+						continue; // skip address if we encounter an error here
 					}
 					$email = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
 

From 741e6e02af746b7b66278b97a1c0aebc123600e3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Sep 2015 20:27:07 +0000
Subject: [PATCH 027/130] Return Deferred promise when app handles the link,
 avoids error Cannot read property 'promise' of undefined

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

diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js
index 258f2573fa..015240bc37 100644
--- a/phpgwapi/js/framework/fw_browser.js
+++ b/phpgwapi/js/framework/fw_browser.js
@@ -136,7 +136,7 @@ var fw_browser =  Class.extend({
 		{
 			var ret = window.app[this.app.appName].linkHandler.call(window.app[this.app.appName], _url);
 			{
-				if (ret === true) return;
+				if (ret === true) return this.loadingDeferred.promise();
 				if (typeof ret === 'string')
 				{
 					_url = ret;

From 999b9f87241bd5447d9fe69a49224b4b18b3d5be Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Sep 2015 21:41:04 +0000
Subject: [PATCH 028/130] Do not give an error about selecting contacts when
 there is no action.

---
 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 966d47fb8c..37504a97a1 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -135,7 +135,7 @@ class addressbook_ui extends addressbook_bo
 				$content['nm']['action'] = 'document';
 				$content['nm']['selected'] = array($id);
 			}
-			if ($content['nm']['action'] !== '')
+			if ($content['nm']['action'] !== '' && $content['nm']['action'] !== null)
 			{
 				if (!count($content['nm']['selected']) && !$content['nm']['select_all'] && $content['nm']['action'] != 'delete_list')
 				{

From e791caf622b26018fadbd05ccbdb6f41b7f5b208 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Sep 2015 21:41:54 +0000
Subject: [PATCH 029/130] Fix admin changing their columns set the default for
 all users

---
 .../inc/class.etemplate_widget_nextmatch.inc.php     | 12 +++++++++++-
 etemplate/js/et2_extension_nextmatch.js              | 12 +++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index 5f71cafff8..10a955c22c 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -1043,7 +1043,17 @@ class etemplate_widget_nextmatch extends etemplate_widget
 		{
 			$pref_name = 'nextmatch-' . (isset($content_value['columnselection_pref']) ? $content_value['columnselection_pref'] : $this->attrs['template']);
 			$refresh_pref_name = $pref_name.'-autorefresh';
-			$pref_level = $value['nm_col_preference'] == 'force' ? 'forced' : 'default';
+			switch($value['nm_col_preference']) {
+				case 'force':
+					$pref_level = 'forced';
+					break;
+				case 'reset':
+				case 'default':
+					$pref_level = 'default';
+					break;
+				default:
+					$pref_level = 'user';
+			}
 
 			// Clear forced pref before setting default
 			if($pref_level != 'forced')
diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 9c37e4762e..a1bb1334d3 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -1421,15 +1421,13 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
 				// Auto refresh
 				self._set_autorefresh(autoRefresh.get_value());
 
-				// Set default or clear forced?
-				if(defaultCheck.get_value())
+				// Set default or clear forced
+				if(show_letters)
 				{
-					if(show_letters)
-					{
-						self.activeFilters.selectcols.push('lettersearch');
-					}
-					self.getInstanceManager().submit();
+					self.activeFilters.selectcols.push('lettersearch');
 				}
+				self.getInstanceManager().submit();
+				
 				self.selectPopup = null;
 			};
 

From d1abc872a622d625ddec17411c60ba5d323394c5 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 22 Sep 2015 09:29:16 +0000
Subject: [PATCH 030/130] Give more width to location field in calendar edit
 dialog

---
 calendar/templates/pixelegg/app.css  | 5 +----
 calendar/templates/pixelegg/app.less | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index f5b5c2ca21..c8733afa56 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
  * @package calendar
  * @version $Id$
  */
-/* $Id: app.css 53581 2015-09-07 17:13:20Z hnategh $ */
+/* $Id: app.css 53642 2015-09-14 15:31:58Z nathangray $ */
 /*Media print classes*/
 @media print {
   .th td,
@@ -1396,9 +1396,6 @@ div.calendar {
   width: 10em;
   padding: 3px 0 5px 10px;
 }
-.calendar_inputFullWidth input {
-  width: 60%;
-}
 /******************************************************************
  * CSS settings for the day, week and month view (timeGridWidget) *
  ******************************************************************/
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index d7d69081ae..4060384e65 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -423,7 +423,7 @@ div.calendar { position: relative; }
     .et2_tabheader{
         background-color: transparent;
     }
-  
+
     input.hasDatepicker,
     #calendar-edit_start{width: 129px;}
 
@@ -714,7 +714,6 @@ div.calendar { position: relative; }
 //# generell
 //###################################################################
 
-.calendar_inputFullWidth input { width: 60%; }
 
 /******************************************************************
  * CSS settings for the day, week and month view (timeGridWidget) *

From 3a240eb67c62c65af24ed292d9ca18eee931cef8 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 22 Sep 2015 11:26:15 +0000
Subject: [PATCH 031/130] Add a patch from Stefan Werfling. -Add new hooks
 etemplate2_before_exec, etemplate2_before_process and
 etemplate2_after_process into etemplate2 execution process

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

diff --git a/etemplate/inc/class.etemplate_new.inc.php b/etemplate/inc/class.etemplate_new.inc.php
index 9fa896933f..f001b1f9ed 100644
--- a/etemplate/inc/class.etemplate_new.inc.php
+++ b/etemplate/inc/class.etemplate_new.inc.php
@@ -102,6 +102,32 @@ class etemplate_new extends etemplate_widget_template
 	 */
 	function exec($method,array $content,array $sel_options=null,array $readonlys=null,array $preserv=null,$output_mode=0,$ignore_validation='',array $changes=null)
 	{
+		$hook_data = $GLOBALS['egw']->hooks->process(
+			array('location'        => 'etemplate2_before_exec') +
+			array('location_name'   => $this->name) +
+			array('location_object' => &$this) +
+			$content
+			);
+
+		foreach($hook_data as $extras) {
+			if (!$extras) continue;
+
+			foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
+				if ($extra['data'] && is_array($extra['data'])) {
+					$content = array_merge($content, $extra['data']);
+				}
+
+				if ($extra['preserve'] && is_array($extra['preserve'])) {
+					$preserv = array_merge($preserv, $extra['preserve']);
+				}
+
+				if ($extra['readonlys'] && is_array($extra['readonlys'])) {
+					$readonlys = array_merge($readonlys, $extra['readonlys']);
+				}
+			}
+		}
+		unset($hook_data);
+		
 		// Include the etemplate2 javascript code
 		egw_framework::validate_file('.', 'etemplate2', 'etemplate');
 
@@ -322,10 +348,61 @@ class etemplate_new extends etemplate_widget_template
 		// tell request call to remove request, if it is not modified eg. by call to exec in callback
 		self::$request->remove_if_not_modified();
 
+		$hook_data = $GLOBALS['egw']->hooks->process(
+			array(
+				'location'        => 'etemplate2_before_process',
+				'location_name'   => $template->id) +
+				self::complete_array_merge(self::$request->preserv, $validated)
+			);
+
+		foreach($hook_data as $extras) {
+			if (!$extras) continue;
+
+			foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
+				if ($extra['data'] && is_array($extra['data'])) {
+					$validated = array_merge($validated, $extra['data']);
+				}
+			}
+		}
+		unset($hook_data);
+
 		//error_log(__METHOD__."(,".array2string($content).')');
 		//error_log(' validated='.array2string($validated));
 		$content = ExecMethod(self::$request->method, self::complete_array_merge(self::$request->preserv, $validated));
 
+		$tcontent = array();
+
+		if( is_array($content) ) {
+			$tcontent = $content;
+		}
+		else {
+			$tcontent = self::complete_array_merge(
+				self::$request->preserv,
+				$validated
+				);
+		}
+
+		$hook_data = $GLOBALS['egw']->hooks->process(
+			array(
+				'location'        => 'etemplate2_after_process',
+				'location_name'   => $template->id) +
+				$tcontent
+			);
+		unset($tcontent);
+
+		if( is_array($content) ) {
+			foreach($hook_data as $extras) {
+				if (!$extras) continue;
+
+				foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
+					if ($extra['data'] && is_array($extra['data'])) {
+						$content = array_merge($content, $extra['data']);
+					}
+				}
+			}
+		}
+		unset($hook_data);
+
 		if (isset($GLOBALS['egw_info']['flags']['java_script']))
 		{
 			// Strip out any script tags

From d693871b0c0ab5e2a6e3bdf1dcd6c81600256053 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 22 Sep 2015 17:26:36 +0000
Subject: [PATCH 032/130] Calendar CSV import - Fix condition checking -
 Participant account match was too nice, restrict to exact matches - Fix
 participants preview was 'Array'

---
 .../inc/class.calendar_import_csv.inc.php     | 70 +++-------------
 calendar/inc/class.calendar_tracking.inc.php  | 82 +++++++++++++------
 ...lass.importexport_basic_import_csv.inc.php | 22 +++++
 3 files changed, 88 insertions(+), 86 deletions(-)

diff --git a/calendar/inc/class.calendar_import_csv.inc.php b/calendar/inc/class.calendar_import_csv.inc.php
index 82f22f3820..1142e0a39f 100644
--- a/calendar/inc/class.calendar_import_csv.inc.php
+++ b/calendar/inc/class.calendar_import_csv.inc.php
@@ -111,7 +111,9 @@ class calendar_import_csv extends importexport_basic_import_csv  {
 				// Search for direct account name, then user in accounts first
 				$search = "\"$name\"";
 				$id = importexport_helper_functions::account_name2id($name);
-				if(!$id) {
+
+				// If not found, or not an exact match to a user (account_name2id is pretty generous)
+				if(!$id || $names[$key] !== $this->bo->participant_name($id)) {
 					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1));
 					if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
 				}
@@ -177,8 +179,8 @@ class calendar_import_csv extends importexport_basic_import_csv  {
 		}
 		$record->tzid = calendar_timezones::id2tz($record->tz_id);
 
-		if ( $_definition->plugin_options['conditions'] ) {
-			foreach ( $_definition->plugin_options['conditions'] as $condition ) {
+		if ( $options['conditions'] ) {
+			foreach ( $options['conditions'] as $condition ) {
 				$records = array();
 				switch ( $condition['type'] ) {
 					// exists
@@ -230,7 +232,7 @@ class calendar_import_csv extends importexport_basic_import_csv  {
 	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$records = array())
 	{
 		if($record->__get($condition['string']) && $condition['string'] == 'id') {
-			$event = $this->bo->read($record[$condition['string']]);
+			$event = $this->bo->read($record->__get($condition['string']));
 			$records = array($event);
 		}
 
@@ -331,64 +333,14 @@ class calendar_import_csv extends importexport_basic_import_csv  {
 	}
 
 	/**
-	 * return etemplate components for options.
-	 * @abstract We can't deal with etemplate objects here, as an uietemplate
-	 * objects itself are scipt orientated and not "dialog objects"
+	 * Alter a row for preview to show multiple participants instead of Array
 	 *
-	 * @return array (
-	 * 		name 		=> string,
-	 * 		content		=> array,
-	 * 		sel_options => array,
-	 * 		preserv		=> array,
-	 * )
+	 * @param egw_record $row_entry
 	 */
-	public function get_options_etpl() {
-		// lets do it!
+	protected function row_preview(importexport_iface_egw_record &$row_entry)
+	{
+		$row_entry->participants = implode('<br />', $this->bo->participants(array('participants' => $row_entry->participants),true));
 	}
 
-	/**
-	 * returns etemplate name for slectors of this plugin
-	 *
-	 * @return string etemplate name
-	 */
-	public function get_selectors_etpl() {
-		// lets do it!
-	}
-
-	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
-		return $this->warnings;
-	}
-
-	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
-		return $this->errors;
-	}
-
-	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
 } // end of iface_export_plugin
 ?>
diff --git a/calendar/inc/class.calendar_tracking.inc.php b/calendar/inc/class.calendar_tracking.inc.php
index 4de483571f..ee4548d633 100644
--- a/calendar/inc/class.calendar_tracking.inc.php
+++ b/calendar/inc/class.calendar_tracking.inc.php
@@ -136,20 +136,7 @@ class calendar_tracking extends bo_tracking
 		{
 			$participants = $data['participants'];
 			$data['participants'] = array();
-			foreach($participants as $uid => $status)
-			{
-				$quantity = $role = $user_type = $user_id = null;
-				calendar_so::split_status($status, $quantity, $role);
-				calendar_so::split_user($uid, $user_type, $user_id);
-				$field = is_numeric($uid) ? 'participants' : 'participants-'.$user_type;
-				$data[$field][] = array(
-					'user_id'	=>	$user_id,
-					'status'	=>	$status,
-					'quantity'	=>	$quantity,
-					'role'		=>	$role,
-					'recur'		=>	$data['recur_date'] ? $data['recur_date'] : 0,
-				);
-			}
+			$data = array_merge($data, $this->alter_participants($participants));
 		}
 		// if clients eg. CalDAV do NOT set participants, they are left untouched
 		// therefore we should not track them, as all updates then show up as all participants removed
@@ -161,19 +148,7 @@ class calendar_tracking extends bo_tracking
 		{
 			$participants = $old['participants'];
 			$old['participants'] = array();
-			foreach($participants as $uid => $status)
-			{
-				calendar_so::split_status($status, $quantity, $role);
-				calendar_so::split_user($uid, $user_type, $user_id);
-				$field = is_numeric($uid) ? 'participants' : 'participants-'.$user_type;
-				$old[$field][] = array(
-					'user_id'	=>	$user_id,
-					'status'	=>	$status,
-					'quantity'	=>	$quantity,
-					'role'		=>	$role,
-					'recur'		=>	$data['recur_date'] ? $data['recur_date'] : 0,
-				);
-			}
+			$old = array_merge($old, $this->alter_participants($participants));
 		}
 		parent::track($data,$old,$user,$deleted, $changed_fields);
 	}
@@ -186,4 +161,57 @@ class calendar_tracking extends bo_tracking
 		unset($data, $old, $deleted);	// unused, but required by function signature
 		return true;
 	}
+
+
+	/**
+	 * Compute changes between new and old data
+	 *
+	 * Can be used to check if saving the data is really necessary or user just pressed save
+	 * Overridden to handle various participants options
+	 *
+	 * @param array $data
+	 * @param array $old = null
+	 * @return array of keys with different values in $data and $old
+	 */
+	public function changed_fields(array $data,array $old=null)
+	{
+		if(is_array($data['participants']))
+		{
+			$participants = $data['participants'];
+			$data['participants'] = array();
+			$data = array_merge($data, $this->alter_participants($participants));
+		}
+		if(is_array($old['participants']))
+		{
+			$participants = $old['participants'];
+			$old['participants'] = array();
+			$old = array_merge($old, $this->alter_participants($participants));
+		}
+		return parent::changed_fields($data,$old);
+	}
+
+	/**
+	* Do some magic with the participants and recurrance.
+	* If this is one of a recurring event, append the recur_date to the participant field so we can
+	* filter by it later.
+	*/
+	protected function alter_participants($participants)
+	{
+		$data = array();
+		foreach($participants as $uid => $status)
+		{
+			$quantity = $role = $user_type = $user_id = null;
+			calendar_so::split_status($status, $quantity, $role);
+			calendar_so::split_user($uid, $user_type, $user_id);
+			$field = is_numeric($uid) ? 'participants' : 'participants-'.$user_type;
+			$data[$field][] = array(
+				'user_id'	=>	$user_id,
+				'status'	=>	$status,
+				'quantity'	=>	$quantity,
+				'role'		=>	$role,
+				'recur'		=>	$data['recur_date'] ? $data['recur_date'] : 0,
+			);
+		}
+		return $data;
+	}
 }
diff --git a/importexport/inc/class.importexport_basic_import_csv.inc.php b/importexport/inc/class.importexport_basic_import_csv.inc.php
index 8144da9fb0..43a6774c4d 100644
--- a/importexport/inc/class.importexport_basic_import_csv.inc.php
+++ b/importexport/inc/class.importexport_basic_import_csv.inc.php
@@ -438,6 +438,7 @@ abstract class importexport_basic_import_csv implements importexport_iface_impor
 		{
 			// Convert to human-friendly
 			importexport_export_csv::convert($row_data,$record_class::$types,$definition->application,$this->lookups);
+			$this->row_preview($row_data);
 			$rows[] = $row_data->get_record_array();
 		}
 		$this->preview_records = array();
@@ -445,6 +446,15 @@ abstract class importexport_basic_import_csv implements importexport_iface_impor
 		return html::table($rows);
 	}
 
+	/**
+	 * Allows an extending class to alter a row for preview
+	 *
+	 * @param egw_record $row_entry
+	 */
+	protected function row_preview(importexport_iface_egw_record &$row_entry)
+	{
+	}
+
 	/**
 	 * Search for contact, but only using family, given & org name fields.
 	 *
@@ -626,6 +636,18 @@ error_log("Searching for $custom_field = $value");
 		// lets do it!
 	}
 
+	/**
+	* Returns warnings that were encountered during importing
+	* Maximum of one warning message per record, but you can append if you need to
+	*
+	* @return Array (
+	*       record_# => warning message
+	*       )
+	*/
+	public function get_warnings() {
+		return $this->warnings;
+	}
+	
 	/**
 	* Returns errors that were encountered during importing
 	* Maximum of one error message per record, but you can append if you need to

From b7da91b7dc3412d4f88d7c0fb0bc8fdac252b58c Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 22 Sep 2015 17:42:18 +0000
Subject: [PATCH 033/130] Calendar CSV import - Handle end date before start
 date

---
 calendar/inc/class.calendar_import_csv.inc.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/calendar/inc/class.calendar_import_csv.inc.php b/calendar/inc/class.calendar_import_csv.inc.php
index 1142e0a39f..7ad8f83149 100644
--- a/calendar/inc/class.calendar_import_csv.inc.php
+++ b/calendar/inc/class.calendar_import_csv.inc.php
@@ -98,6 +98,14 @@ class calendar_import_csv extends importexport_basic_import_csv  {
 			$record->owner = $options['owner'];
 		}
 
+		// Handle errors in length or start/end date
+		if($record->start > $record->end)
+		{
+			$record->end = $record->start + $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength'] * 60;
+			$this->warnings[$import_csv->get_current_position()] = lang('error: starttime has to be before the endtime !!!');
+		}
+
+		// Parse particpants
 		if ($record->participants && !is_array($record->participants)) {
 			// Importing participants in human friendly format:
 			// Name (quantity)? (status) Role[, Name (quantity)? (status) Role]+

From 9e9cbc2fa1346c109523c2b834dd3a638cdf41e3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 22 Sep 2015 23:43:20 +0000
Subject: [PATCH 034/130] Some changes to egw.css to try to avoid it randomly
 ignoring rules in iframes.

Reduces wrong width in admin customfields or categories after you click 3 times.
---
 admin/templates/default/categories.index.xet |  2 +-
 etemplate/js/et2_dataview.js                 | 18 ++++++++++++++++++
 phpgwapi/js/jsapi/egw_core.js                |  2 +-
 phpgwapi/js/jsapi/egw_css.js                 | 19 +++++++++++--------
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/admin/templates/default/categories.index.xet b/admin/templates/default/categories.index.xet
index 36f30dc1c4..7312447376 100644
--- a/admin/templates/default/categories.index.xet
+++ b/admin/templates/default/categories.index.xet
@@ -4,7 +4,7 @@
 <overlay>
 	<template id="admin.categories.index.right" template="" lang="" group="0" version="1.9.001">
 		<hbox>
-			<buttononly align="right" label="Add" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;"/>
+			<buttononly align="right" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;"/>
 		</hbox>
 	</template>
 	<template id="admin.categories.index.rows" template="" lang="" group="0" version="1.9.002">
diff --git a/etemplate/js/et2_dataview.js b/etemplate/js/et2_dataview.js
index bd5353c395..af6dadf0d4 100644
--- a/etemplate/js/et2_dataview.js
+++ b/etemplate/js/et2_dataview.js
@@ -258,6 +258,24 @@ var et2_dataview = Class.extend({
 			this.columnMgr = null;
 		}
 
+		// Remove dynamic CSS,
+		for (var i = 0; i < this.columns.length; i++)
+		{
+			if(this.columns[i].tdClass)
+			{
+				this.egw.css('.'+this.columns[i].tdClass);
+			}
+			if(this.columns[i].divClass)
+			{
+				this.egw.css('.'+this.columns[i].divClass);
+				this.egw.css(".egwGridView_outer ." + this.columns[i].divClass);
+				this.egw.css(".egwGridView_grid ." + this.columns[i].divClass);
+			}
+		}
+		this.egw.css(".egwGridView_grid ." + this.uniqueId + "_div_fullRow");
+		this.egw.css(".egwGridView_outer ." + this.uniqueId + "_td_fullRow");
+		this.egw.css(".egwGridView_outer ." + this.uniqueId + "_spacer_fullRow");
+		
 		// Reset the headerColumns array and empty the table row
 		this.columnNodes = [];
 		this.columns = [];
diff --git a/phpgwapi/js/jsapi/egw_core.js b/phpgwapi/js/jsapi/egw_core.js
index 12b921f692..344ee25b7b 100644
--- a/phpgwapi/js/jsapi/egw_core.js
+++ b/phpgwapi/js/jsapi/egw_core.js
@@ -449,7 +449,7 @@
 			{
 				case 0:
 					// Return the global instance
-					return egw;
+					return instances['~global~'][0]['instance'];
 
 				case 1:
 					if (typeof arguments[0] === 'string')
diff --git a/phpgwapi/js/jsapi/egw_css.js b/phpgwapi/js/jsapi/egw_css.js
index 00b56969ed..e18edf8f11 100644
--- a/phpgwapi/js/jsapi/egw_css.js
+++ b/phpgwapi/js/jsapi/egw_css.js
@@ -49,9 +49,9 @@ egw.extend('css', egw.MODULE_WND_LOCAL, function(_app, _wnd) {
 		 */
 		css: function(_selector, _rule) {
 			// Set the current index to the maximum index
-			var index = selectorCount;
+			var index = sheet ? Math.min(selectorCount, sheet.cssRules.length) : 0;
 
-			if (!sheet)
+			if (!sheet || !sheet.ownerNode)
 			{
 				// Generate a style tag, which will be used to hold the newly generated css
 				// rules.
@@ -67,13 +67,16 @@ egw.extend('css', egw.MODULE_WND_LOCAL, function(_app, _wnd) {
 			{
 				// Store the old index
 				index = selectors[_selector];
-				if (typeof sheet.removeRule !== "undefined")
+				if(index < sheet.cssRules.length)
 				{
-					sheet.removeRule(index);
-				}
-				else
-				{
-					sheet.deleteRule(index);
+					if (typeof sheet.removeRule !== "undefined")
+					{
+						sheet.removeRule(index);
+					}
+					else
+					{
+						sheet.deleteRule(index);
+					}
 				}
 
 				delete (selectors[_selector]);

From 773fbf7eeada42ec17f480d34e202476e919462c Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 23 Sep 2015 10:51:27 +0000
Subject: [PATCH 035/130] Fix mail compose resize does not work always

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

diff --git a/mail/js/app.js b/mail/js/app.js
index feb79dbdb3..f84b8d6e97 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -225,12 +225,13 @@ app.classes.mail = AppJS.extend(
  				// use a wrapper on a different url to be able to use a different fpm pool
 				et2.menuaction = 'mail_compose::ajax_send';
 				var that = this;
+				var textAreaWidget = this.et2.getWidgetById('mail_htmltext');
 				this.mail_isMainWindow = false;
 				this.compose_fieldExpander_init();
 				this.check_sharing_filemode();
-
+				
 				this.subject2title();
-
+				
 				// Set autosaving interval to 2 minutes for compose message
 				this.W_INTERVALS.push(window.setInterval(function (){
 					that.saveAsDraft(null, 'autosaving');
@@ -245,9 +246,14 @@ app.classes.mail = AppJS.extend(
 				});
 				/*Trigger compose_resizeHandler after the CKEditor is fully loaded*/
 				jQuery('#mail-compose').on ('load',function() {
-					window.setTimeout(function(){
-						that.compose_fieldExpander();
-					}, 300);
+					if (textAreaWidget && typeof textAreaWidget.ckeditor != 'undefined')
+					{
+						textAreaWidget.ckeditor.on('instanceReady', function(){that.compose_fieldExpander();});
+					}
+					else
+					{
+						this.compose_fieldExpander();
+					}
 				});
 				
 				//Resize compose after window resize to not getting scrollbar
@@ -274,7 +280,7 @@ app.classes.mail = AppJS.extend(
 					}
 					else
 					{
-						this.et2.getWidgetById('mail_htmltext').ckeditor.on('instanceReady', function(e) {
+						textAreaWidget.ckeditor.on('instanceReady', function(e) {
 							this.focus();
 						});
 					}

From 0a43abbec2b89128a4dd5b2df1b49d944fcd5255 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 23 Sep 2015 15:32:36 +0000
Subject: [PATCH 036/130] Use etemplate_widget_menupopup::fix_encoded_options()
 to handle select options set by get_rows functions.

Fixes tracker CRM view stops working after filtering.
---
 .../inc/class.etemplate_widget_nextmatch.inc.php     | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index 10a955c22c..678805cd47 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -649,17 +649,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
 				{
 					foreach($row as &$options)
 					{
-						foreach($options as &$label)
-						{
-							if(!is_array($label))
-							{
-								$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
-							}
-							else if ($label['label'])
-							{
-								$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
-							}
-						}
+						etemplate_widget_menupopup::fix_encoded_options($options, true);
 					}
 				}
 				$rows[$n] = $row;

From 45b9d9e74540452719b632a567e79b19067d863a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 23 Sep 2015 15:51:46 +0000
Subject: [PATCH 037/130] Do not trigger autocomplete fix if the browser is
 Safari and there's an input with type password, since the Safari does not
 respect autocomplete = off - Fix password autofill issue in compose dialog

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

diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index 9ed91d0c89..25356f9059 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -607,6 +607,16 @@ etemplate2.prototype.autocomplete_fixer = function ()
 {
 	var self = this;
 	var form = self.DOMContainer;
+	
+	// Safari always do the autofill for password field regardless of autocomplete = off
+	// and since there's no other way to switch the autocomplete of, we should switch the
+	// form autocomplete off (e.g. compose dialog, attachment password field)
+	if (navigator.userAgent.match(/safari/i) && !navigator.userAgent.match(/chrome/i)
+			&& jQuery('input[type="password"]').length > 0)
+	{
+		return;
+	}
+	
 	if (form)
 	{
 		// Stop submit propagation in order to not fire other possible submit events

From 711ca554331f64d5201558cc8c0f49c5bc52b43c Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 23 Sep 2015 16:22:47 +0000
Subject: [PATCH 038/130] Some more changes to egw.css to try to avoid it
 randomly losing rules in iframes

---
 phpgwapi/js/jsapi/egw_css.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/js/jsapi/egw_css.js b/phpgwapi/js/jsapi/egw_css.js
index e18edf8f11..27180d4046 100644
--- a/phpgwapi/js/jsapi/egw_css.js
+++ b/phpgwapi/js/jsapi/egw_css.js
@@ -51,7 +51,7 @@ egw.extend('css', egw.MODULE_WND_LOCAL, function(_app, _wnd) {
 			// Set the current index to the maximum index
 			var index = sheet ? Math.min(selectorCount, sheet.cssRules.length) : 0;
 
-			if (!sheet || !sheet.ownerNode)
+			if (!sheet || !sheet.ownerNode || sheet.ownerNode.ownerDocument !== _wnd.document)
 			{
 				// Generate a style tag, which will be used to hold the newly generated css
 				// rules.
@@ -60,6 +60,9 @@ egw.extend('css', egw.MODULE_WND_LOCAL, function(_app, _wnd) {
 
 				// Obtain the reference to the styleSheet object of the generated style tag
 				sheet = style.sheet ? style.sheet : style.styleSheet;
+
+				selectorCount = 0;
+				selectors = {};
 			}
 
 			// Remove any existing rule first, of no rule exists for the

From e3d6e09922aa90a36b0592505a2a4a529c447af6 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 23 Sep 2015 17:39:55 +0000
Subject: [PATCH 039/130] Fix import of vCard photos with ENCODING=BASE64

---
 addressbook/inc/class.addressbook_egw_record.inc.php   | 3 +--
 addressbook/inc/class.addressbook_import_vcard.inc.php | 8 ++++----
 addressbook/inc/class.addressbook_vcal.inc.php         | 7 +++++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addressbook/inc/class.addressbook_egw_record.inc.php b/addressbook/inc/class.addressbook_egw_record.inc.php
index a37c48b987..66d48e6b89 100644
--- a/addressbook/inc/class.addressbook_egw_record.inc.php
+++ b/addressbook/inc/class.addressbook_egw_record.inc.php
@@ -78,8 +78,7 @@ class addressbook_egw_record implements importexport_iface_egw_record
 	 * @return array complete record as associative array
 	 */
 	public function get_record_array() {
-		// do not return binary jpeg, it messes up json data
-		return array_diff_key($this->contact, array('jpegphoto' => true));
+		return $this->contact;
 	}
 
 	/**
diff --git a/addressbook/inc/class.addressbook_import_vcard.inc.php b/addressbook/inc/class.addressbook_import_vcard.inc.php
index e32bd09655..0252778401 100644
--- a/addressbook/inc/class.addressbook_import_vcard.inc.php
+++ b/addressbook/inc/class.addressbook_import_vcard.inc.php
@@ -121,8 +121,8 @@ class addressbook_import_vcard implements importexport_iface_import_plugin  {
 		// Failures
 		$this->errors = array();
 
-		 // Fix for Apple Addressbook
-                $vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1', stream_get_contents($_stream));
+		// Fix for Apple Addressbook
+        $vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1', stream_get_contents($_stream));
 
 		$contacts = new egw_ical_iterator($vCard, '', $charset, array($this, '_vcard'),array(
 			// Owner (addressbook)
@@ -272,7 +272,7 @@ class addressbook_import_vcard implements importexport_iface_import_plugin  {
 		foreach($this->preview_records as $i => $record)
 		{
 			// Convert to human-friendly
-                        importexport_export_csv::convert($record,$record_class::$types,$_definition->application);
+            importexport_export_csv::convert($record,$record_class::$types,$_definition->application);
 			$record = $record->get_record_array();
 			$row = array();
 			foreach($labels as $field => $label)
@@ -282,7 +282,7 @@ class addressbook_import_vcard implements importexport_iface_import_plugin  {
 				// Don't scare users, do something with jpeg
 				if($field == 'jpegphoto' && $row[$field])
 				{
-					$row[$field] = '<span style="white-space: nowrap;">-ENCODED IMAGE-</span>';
+					$row[$field] = '<img style="max-width:50px;max-height:50px;" src="data:image/jpeg;base64,'.$row[$field].'"/>';
 				}
 				unset($record[$field]);
 			}
diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index 05140a3f01..4e31a44268 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -953,8 +953,11 @@ class addressbook_vcal extends addressbook_bo
 								break;
 
 							case 'jpegphoto':
-								$contact[$fieldName] = $vcardValues[$vcardKey]['params']['ENCODING'] == 'b' ?
-									base64_decode($vcardValues[$vcardKey]['value']): $vcardValues[$vcardKey]['value'];
+								$contact[$fieldName] = $vcardValues[$vcardKey]['value'];
+								if(in_array($vcardValues[$vcardKey]['params']['ENCODING'],array('b','B','BASE64')))
+								{
+									$contact[$fieldName] = base64_decode($contact[$fieldName]);
+								}
 								break;
 
 							case 'note':

From 17afd5d508306d3cae76050b1f003fdaae07329c Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 23 Sep 2015 17:41:50 +0000
Subject: [PATCH 040/130] Fix invalid call to non-existing method

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

diff --git a/importexport/inc/class.importexport_export_csv.inc.php b/importexport/inc/class.importexport_export_csv.inc.php
index 8aefe90653..f6ba1e3e71 100644
--- a/importexport/inc/class.importexport_export_csv.inc.php
+++ b/importexport/inc/class.importexport_export_csv.inc.php
@@ -258,7 +258,7 @@ class importexport_export_csv implements importexport_iface_export_record
 				case 'select':
 					if (count($c_field['values']) == 1 && isset($c_field['values']['@']))
 					{
-						$c_field['values'] = ExecMethod('etemplate.customfields_widget._get_options_from_file', $c_field['values']['@']);
+						$c_field['values'] = egw_customfields::get_options_from_file($c_field['values']['@']);
 					}
 					$fields['select'][] = $name;
 					$selects[$name] = $c_field['values'];

From 35ef38e0409984c0c2fb0e00fa4b94ec1a3d2a62 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 24 Sep 2015 09:24:06 +0000
Subject: [PATCH 041/130] WIP toggle sidebar menu: - Fix some styles for Safari
 and IE

---
 pixelegg/css/mobile.css                  | 15 +++++++++++++++
 pixelegg/css/pixelegg.css                | 15 +++++++++++++++
 pixelegg/less/layout_raster_sidebar.less | 15 +++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index de44759f33..002f553f3f 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -4986,7 +4986,12 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_toggler span:before {
   transition-duration: 0.7s;
+  -webkit-transition-duration: 0.7s;
+  -moz-transition-duration: 0.7s;
   transform: rotate(145deg) translate(8px, -2px);
+  -ms-transform: rotate(145deg) translate(8px, -2px);
+  -moz-transform: rotate(145deg) translate(8px, -2px);
+  -webkit-transform: rotate(145deg) translate(8px, -2px);
   background-color: #b4b4b4;
 }
 #egw_fw_sidebar #egw_fw_toggler span:before,
@@ -5004,7 +5009,12 @@ td.message span.message {
 #egw_fw_sidebar #egw_fw_toggler span:after {
   top: 9px;
   transition-duration: 0.7s;
+  -webkit-transition-duration: 0.7s;
+  -moz-transition-duration: 0.7s;
   transform: rotate(-145deg) translate(8px, 2px);
+  -ms-transform: rotate(-145deg) translate(8px, 2px);
+  -moz-transform: rotate(-145deg) translate(8px, 2px);
+  -webkit-transform: rotate(-145deg) translate(8px, 2px);
   background-color: #606060;
 }
 #egw_fw_sidebar .egw_fw_sidebar_toggleOn {
@@ -5018,10 +5028,15 @@ td.message span.message {
 #egw_fw_sidebar .egw_fw_sidebar_toggleOn #egw_fw_toggler span {
   background-color: #b4b4b4;
   transition: all 0.3s;
+  -webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
 }
 #egw_fw_sidebar .egw_fw_sidebar_toggleOn #egw_fw_toggler span:before,
 #egw_fw_sidebar .egw_fw_sidebar_toggleOn #egw_fw_toggler span:after {
   transform: none;
+  -ms-transform: none;
+  -moz-transform: none;
+  -webkit-transform: none;
   width: 100%;
   height: 5px;
   background-color: #b4b4b4;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index ed3c6b4b4f..df43057f9d 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -4975,7 +4975,12 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_toggler span:before {
   transition-duration: 0.7s;
+  -webkit-transition-duration: 0.7s;
+  -moz-transition-duration: 0.7s;
   transform: rotate(145deg) translate(8px, -2px);
+  -ms-transform: rotate(145deg) translate(8px, -2px);
+  -moz-transform: rotate(145deg) translate(8px, -2px);
+  -webkit-transform: rotate(145deg) translate(8px, -2px);
   background-color: #b4b4b4;
 }
 #egw_fw_sidebar #egw_fw_toggler span:before,
@@ -4993,7 +4998,12 @@ td.message span.message {
 #egw_fw_sidebar #egw_fw_toggler span:after {
   top: 9px;
   transition-duration: 0.7s;
+  -webkit-transition-duration: 0.7s;
+  -moz-transition-duration: 0.7s;
   transform: rotate(-145deg) translate(8px, 2px);
+  -ms-transform: rotate(-145deg) translate(8px, 2px);
+  -moz-transform: rotate(-145deg) translate(8px, 2px);
+  -webkit-transform: rotate(-145deg) translate(8px, 2px);
   background-color: #606060;
 }
 #egw_fw_sidebar .egw_fw_sidebar_toggleOn {
@@ -5007,10 +5017,15 @@ td.message span.message {
 #egw_fw_sidebar .egw_fw_sidebar_toggleOn #egw_fw_toggler span {
   background-color: #b4b4b4;
   transition: all 0.3s;
+  -webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
 }
 #egw_fw_sidebar .egw_fw_sidebar_toggleOn #egw_fw_toggler span:before,
 #egw_fw_sidebar .egw_fw_sidebar_toggleOn #egw_fw_toggler span:after {
   transform: none;
+  -ms-transform: none;
+  -moz-transform: none;
+  -webkit-transform: none;
   width: 100%;
   height: 5px;
   background-color: #b4b4b4;
diff --git a/pixelegg/less/layout_raster_sidebar.less b/pixelegg/less/layout_raster_sidebar.less
index 739c2c4e33..298e49fab4 100644
--- a/pixelegg/less/layout_raster_sidebar.less
+++ b/pixelegg/less/layout_raster_sidebar.less
@@ -346,7 +346,12 @@
 			background-color: transparent;
 			&:before{
 				transition-duration: 0.7s;
+				-webkit-transition-duration: 0.7s;
+				-moz-transition-duration: 0.7s;
 				transform: rotate(145deg) translate(8px, -2px);
+				-ms-transform: rotate(145deg) translate(8px, -2px);
+				-moz-transform: rotate(145deg) translate(8px, -2px);
+				-webkit-transform: rotate(145deg) translate(8px, -2px);
 				background-color: #b4b4b4;
 			}
 			&:before, &:after {
@@ -363,7 +368,12 @@
 			&:after {
 				top:9px;
 				transition-duration: 0.7s;
+				-webkit-transition-duration: 0.7s;
+				-moz-transition-duration: 0.7s;
 				transform: rotate(-145deg) translate(8px, 2px);
+				-ms-transform: rotate(-145deg) translate(8px, 2px);
+				-moz-transform: rotate(-145deg) translate(8px, 2px);
+				-webkit-transform: rotate(-145deg) translate(8px, 2px);
 				background-color: #606060;
 			}
 			position: relative;
@@ -383,8 +393,13 @@
 			span {
 				background-color: #b4b4b4;
 				transition: all 0.3s;
+				-webkit-transition: all 0.3s;
+				-moz-transition: all 0.3s;
 				&:before, &:after {
 					transform:none;
+					-ms-transform: none;
+					-moz-transform: none;
+					-webkit-transform: none;
 					width:100%;
 					height:5px;
 					background-color: #b4b4b4;

From 397d5a6d36c13f1f6b0fb4a4970d923c1c22a01e Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 24 Sep 2015 10:06:22 +0000
Subject: [PATCH 042/130] fix problem with possible json_encode problem
 (removing all initial data from mailbody) on reply/forward

---
 mail/inc/class.mail_compose.inc.php    | 32 +++---------------
 mail/inc/class.mail_ui.inc.php         | 46 ++------------------------
 phpgwapi/inc/class.translation.inc.php | 36 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 71 deletions(-)

diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 0d2be223d0..a9f42d4509 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1118,28 +1118,7 @@ class mail_compose
 
 		// prepare body
 		// in a way, this tests if we are having real utf-8 (the displayCharset) by now; we should if charsets reported (or detected) are correct
-		if (strtoupper($this->displayCharset) == 'UTF-8')
-		{
-			$test = @json_encode($content['body']);
-			//error_log(__METHOD__.__LINE__.' ->'.strlen($singleBodyPart['body']).' Error:'.json_last_error().'<- BodyPart:#'.$test.'#');
-			//if (json_last_error() != JSON_ERROR_NONE && strlen($singleBodyPart['body'])>0)
-			if ($test=="null" && strlen($content['body'])>0)
-			{
-				// try to fix broken utf8
-				$x = (function_exists('mb_convert_encoding')?mb_convert_encoding($content['body'],'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$content['body']):$content['body']));
-				$test = @json_encode($x);
-				if ($test=="null" && strlen($content['body'])>0)
-				{
-					// this should not be needed, unless something fails with charset detection/ wrong charset passed
-					error_log(__METHOD__.__LINE__.' Charset problem detected; Charset Detected:'.mail_bo::detect_encoding($content['body']));
-					$content['body'] = utf8_encode($content['body']);
-				}
-				else
-				{
-					$content['body'] = $x;
-				}
-			}
-		}
+		$content['body'] = translation::convert_jsonsafe($content['body'],'utf-8');
 		//error_log(__METHOD__.__LINE__.array2string($content));
 
 		// get identities of all accounts as "$acc_id:$ident_id" => $identity
@@ -1630,7 +1609,7 @@ class mail_compose
 					$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>";
 				}
 				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = mail_bo::detect_encoding($bodyParts[$i]['body']);
-				$bodyParts[$i]['body'] = translation::convert($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
+				$bodyParts[$i]['body'] = translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$this->sessionData['body'] .= ($i>0?"<br>":""). $bodyParts[$i]['body'] ;
 			}
@@ -1644,7 +1623,7 @@ class mail_compose
 					$this->sessionData['body'] .= "<hr>";
 				}
 				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = mail_bo::detect_encoding($bodyParts[$i]['body']);
-				$bodyParts[$i]['body'] = translation::convert($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
+				$bodyParts[$i]['body'] = translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
 				#error_log( "GetDraftData (Plain) CharSet".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$this->sessionData['body'] .= ($i>0?"\r\n":""). $bodyParts[$i]['body'] ;
 			}
@@ -2094,7 +2073,7 @@ class mail_compose
 				$_htmlConfig = mail_bo::$htmLawed_config;
 				mail_bo::$htmLawed_config['comment'] = 2;
 				mail_bo::$htmLawed_config['transform_anchor'] = false;
-				$this->sessionData['body'] .= "<br>".self::_getCleanHTML(translation::convert($bodyParts[$i]['body'], $bodyParts[$i]['charSet']));
+				$this->sessionData['body'] .= "<br>".self::_getCleanHTML(translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']));
 				mail_bo::$htmLawed_config = $_htmlConfig;
 				#error_log( "GetReplyData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 			}
@@ -2117,8 +2096,7 @@ class mail_compose
 				}
 
 				// add line breaks to $bodyParts
-				if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = mail_bo::detect_encoding($bodyParts[$i]['body']);
-				$newBody	= translation::convert($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
+				$newBody = translation::convert_jsonsafe($bodyParts[$i]['body'],$bodyParts[$i]['charSet']);
 				#error_log( "GetReplyData (Plain) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'));
 				$newBody = mail_ui::resolve_inline_images($newBody, $_folder, $_uid, $_partID, 'plain');
 				$this->sessionData['body'] .= "\r\n";
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index a9745f56d5..c44da59b2d 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1961,23 +1961,7 @@ class mail_ui
 			foreach ($attachments as $key => $value)
 			{
 				$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]['filename'] = translation::convert_jsonsafe($attachmentHTML[$key]['filename'],'utf-8');
 				//error_log(array2string($value));
 				//error_log(strtoupper($value['mimeType']) .'<->'. mime_magic::filename2mime($attachmentHTML[$key]['filename']));
 				if (strtoupper($value['mimeType']=='APPLICATION/OCTET-STREAM')) $value['mimeType'] = mime_magic::filename2mime($attachmentHTML[$key]['filename']);
@@ -2749,33 +2733,7 @@ class mail_ui
 			{
 				$singleBodyPart['body'] = preg_replace($sar,$rar,$singleBodyPart['body']);
 			}
-			if ($singleBodyPart['charSet']===false) $singleBodyPart['charSet'] = translation::detect_encoding($singleBodyPart['body']);
-			$singleBodyPart['body'] = $GLOBALS['egw']->translation->convert(
-				$singleBodyPart['body'],
-				strtolower($singleBodyPart['charSet'])
-			);
-			// in a way, this tests if we are having real utf-8 (the displayCharset) by now; we should if charsets reported (or detected) are correct
-			if (strtoupper(mail_bo::$displayCharset) == 'UTF-8')
-			{
-				$test = @json_encode($singleBodyPart['body']);
-				//error_log(__METHOD__.__LINE__.' ->'.strlen($singleBodyPart['body']).' Error:'.json_last_error().'<- BodyPart:#'.$test.'#');
-				if (($test=="null" || $test === false || is_null($test)) && strlen($singleBodyPart['body'])>0)
-				{
-					// try to fix broken utf8
-					$x = (function_exists('mb_convert_encoding')?mb_convert_encoding($singleBodyPart['body'],'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$singleBodyPart['body']):$singleBodyPart['body']));
-					$test = @json_encode($x);
-					if (($test=="null" || $test === false || is_null($test)) && strlen($singleBodyPart['body'])>0)
-					{
-						// this should not be needed, unless something fails with charset detection/ wrong charset passed
-						error_log(__METHOD__.__LINE__.' Charset Reported:'.$singleBodyPart['charSet'].' Charset Detected:'.translation::detect_encoding($singleBodyPart['body']));
-						$singleBodyPart['body'] = utf8_encode($singleBodyPart['body']);
-					}
-					else
-					{
-						$singleBodyPart['body'] = $x;
-					}
-				}
-			}
+			$singleBodyPart['body'] = translation::convert_jsonsafe($singleBodyPart['body'],$singleBodyPart['charSet']);
 			//error_log(__METHOD__.__LINE__.array2string($singleBodyPart));
 			if($singleBodyPart['mimeType'] == 'text/plain')
 			{
diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 987818c8a6..c08c445815 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -921,6 +921,42 @@ class translation
 		return $data;
 	}
 
+	/**
+	 * converts a string $data from charset $from to something that is json_encode tested
+	 *
+	 * @param string/array $data string(s) to convert
+	 * @param string/boolean $from charset $data is in or False if it should be detected
+	 * @return string/array converted string(s) from $data
+	 */
+	static function convert_jsonsafe($data,$from=False)
+	{
+		if ($from===false) $from = self::detect_encoding($data);
+		$data = self::convert($data,strtolower($from));
+		// in a way, this tests if we are having real utf-8 (the displayCharset) by now; we should if charsets reported (or detected) are correct
+		if (strtoupper(self::charset()) == 'UTF-8')
+		{
+			$test = @json_encode($data);
+			//error_log(__METHOD__.__LINE__.' ->'.strlen($data).' Error:'.json_last_error().'<- data:#'.$test.'#');
+			if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+			{
+				// try to fix broken utf8
+				$x = (function_exists('mb_convert_encoding')?mb_convert_encoding($data,'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$data):$data));
+				$test = @json_encode($x);
+				if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+				{
+					// this should not be needed, unless something fails with charset detection/ wrong charset passed
+					error_log(__METHOD__.__LINE__.' Charset Reported:'.$from.' Charset Detected:'.translation::detect_encoding($data));
+					$data = utf8_encode($data);
+				}
+				else
+				{
+					$data = $x;
+				}
+			}
+		}
+		return $data;
+	}
+
 	/**
 	 * insert/update/delete one phrase in the lang-table
 	 *

From 3bc2e1077cc9504ca3776d3cc0ecc1e463076356 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 25 Sep 2015 15:18:35 +0000
Subject: [PATCH 043/130] WIP EGroupware tutorial: - Implement a hook for
 application specific video tutorials - Allow iframe widget to cooperate with
 fullscreen video play mode

---
 etemplate/js/et2_widget_iframe.js            |  12 +-
 etemplate/templates/default/egw_tutorial.xet |  20 ++++
 mail/inc/class.mail_hooks.inc.php            |   2 +
 phpgwapi/inc/class.hooks.inc.php             |  19 ++++
 phpgwapi/js/jsapi/app_base.js                | 109 ++++++++++++++++++-
 5 files changed, 160 insertions(+), 2 deletions(-)
 create mode 100644 etemplate/templates/default/egw_tutorial.xet

diff --git a/etemplate/js/et2_widget_iframe.js b/etemplate/js/et2_widget_iframe.js
index c477b8ef1f..5d15d2dab9 100644
--- a/etemplate/js/et2_widget_iframe.js
+++ b/etemplate/js/et2_widget_iframe.js
@@ -45,7 +45,13 @@ var et2_iframe = et2_valueWidget.extend(
 			"default": "",
 			description: "Specifies name of frame, to be used as target for links",
 			type: "string"
-		}
+		},
+		fullscreen: {
+			name: "Fullscreen",
+			"default": false,
+			description: "Make the iframe compatible to be a fullscreen video player mode",
+			type: "boolean"
+		},
 	},
 
 	/**
@@ -64,6 +70,10 @@ var et2_iframe = et2_valueWidget.extend(
 		{
 			this.htmlNode.append('<span class="et2_label">'+this.options.label+'</span>');
 		}
+		if (this.options.fullscreen)
+		{
+			this.htmlNode.attr('allowfullscreen', true);
+		}
 		this.setDOMNode(this.htmlNode[0]);
 	},
 
diff --git a/etemplate/templates/default/egw_tutorial.xet b/etemplate/templates/default/egw_tutorial.xet
new file mode 100644
index 0000000000..71d38a593c
--- /dev/null
+++ b/etemplate/templates/default/egw_tutorial.xet
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
+<overlay>
+	<template id="etemplate.egw_tutorial" template="" lang="" group="0" version="15.1">
+		<grid id="list" class="egwGridView_grid" height="200" overflow="auto">
+			<columns>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<vbox>
+						<description value = "$row_cont[title]" onclick="$row_cont[onclick]"/>
+						<iframe value="$row_cont[src]" width="99%" seamless="true" fullscreen="true"/>
+					</vbox>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php
index 63766a7d39..412c0c47aa 100644
--- a/mail/inc/class.mail_hooks.inc.php
+++ b/mail/inc/class.mail_hooks.inc.php
@@ -534,6 +534,8 @@ class mail_hooks
 			display_sidebox($appname,lang('Admin'),$file);
 		}
 		hooks::pgp_encryption_menu('mail');
+		
+		hooks::egw_tutorial_menu('mail');
 	}
 
 	/**
diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index 26235cef96..18c2c64f3e 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -379,4 +379,23 @@ class hooks
 		);
 		display_sidebox($appname, lang('PGP Encryption'), $file);
 	}
+	
+	/**
+	 * Static function to build egw tutorial sidebox menu
+	 *
+	 * @param type $appname application name
+	 */
+	public static function egw_tutorial_menu($appname)
+	{
+		$file = Array (
+			array(
+				'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox"/>',
+				'no_lang' => true,
+				'link'    => false,
+				'icon'    => false,
+			),
+			'menuOpened'  => true
+		);
+		display_sidebox($appname, lang('EGroupware Tutorial'), $file);
+	}
 }
diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index 03b8a23712..4f5eed5dbd 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -147,6 +147,9 @@ var AppJS = Class.extend(
 
 		// Highlights the favorite based on initial list state
 		this.highlight_favorite();
+		
+		// Initialize egw tutorial sidebox
+		this.egwTutorial_init();
 	},
 
 	/**
@@ -954,7 +957,111 @@ var AppJS = Class.extend(
 			}).sendRequest(true);
 		}
 	},
-
+	
+	/**
+	 * Get json data for videos from the given url
+	 * @param {string} _url url of tutorials json file
+	 * 
+	 * @return {Promise, object} return Promise, json object as resolved result and error message in case of failure
+	 */
+	egwTutorialGetData: function(_url){
+		var url = _url;
+		return new Promise (function(_resolve, _reject)
+		{
+			var resolve = _resolve;
+			var reject = _reject;
+			jQuery.ajax({
+				method:'GET',
+				url: url,
+				success: function (_data) {
+					resolve(_data);
+				},
+				fail: function (_err) {
+					reject(_err);
+				}
+			});
+		});
+	},
+	
+	/**
+	 * Create and Render etemplate2 for egroupware tutorial
+	 * sidebox option. The .xet file is stored in etemplate/templates/default/egw_tutorials
+	 * 
+	 * @description tutorials json object should have the following structure:
+	 *	object:
+	 *		{
+	 *			[app name]:{
+	 *				[language tag]:[
+	 *					{src:"",title:"",top:""}		
+	 *				]
+	 *			}
+	 *		}
+	 *	
+	 *	*Note: "top" and "title" are optional attributes, which "top" means that specific video should
+	 *		appears on top of the list.
+	 *	
+	 *	example:
+	 *		{
+	 *			"mail":{
+	 *				"en":[
+	 *					{src:"https://www.youtube.com/embed/mCDJndpjO40", "title":"PGP Encryption"},
+	 *					{src:"https://www.youtube.com/embed/mCDJndpjO", "title":"Subscription", top:true},
+	 *				],
+	 *				"de":[
+	 *					{src:"https://www.youtube.com/embed/m40", "title":"PGP Verschlüsselung"},
+	 *					{src:"https://www.youtube.com/embed/mpjO", "title":"Ordner Abonnieren", top:true},
+	 *				]
+	 *			}
+	 *		}
+	 */
+	egwTutorial_init: function()
+	{
+		//DOM container
+		var div = document.getElementById('egw_tutorial_'+egw.app_name()+'_sidebox');
+		// et2 object
+		var etemplate = new etemplate2 (div, false);
+		var template = egw.webserverUrl+'/etemplate/templates/default/egw_tutorial.xet';
+		
+		this.egwTutorialGetData(egw.webserverUrl+'/tutorials.json').then(function(_data){
+			var lang = egw.preference('lang');
+			var content = {content:{list:[]}};
+			if (_data && _data[egw.app_name()])
+			{
+				if (_data[egw.app_name()][lang] == 'undefined' || _data[egw.app_name()][lang].length == 0 ) lang = 'en';
+				if (typeof _data[egw.app_name()][lang] !='undefined' 
+					&& _data[egw.app_name()][lang].length > 0)
+				{
+					for (var i=0;i<=_data[egw.app_name()][lang];i++)
+					{
+						_data[egw.app_name()][lang][i]['onclick'] = 'egw.open()';
+					}
+					content.content.list = _data[egw.app_name()][lang];
+					// Get the video with top property into the top of the list
+					content.content.list.sort(function(a){
+						if (!a.top) return 1;
+					});
+					
+					if (template.indexOf('.xet') >0)
+					{
+						etemplate.load ('',template , content, function(){});
+					}
+					else
+					{
+						etemplate.load (template, '', content);
+					}
+				}
+			}	
+		},
+		function(_err){
+			consloe.log(_err);
+		});
+	},
+	
+	egwTutorialPopup: function ()
+	{
+		
+	},
+	
 	/**
 	 * Check if Mailvelope is available, open (or create) "egroupware" keyring and call callback with it
 	 *

From 9fce06e650bf35b17834ebe5f34c1894c0581662 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 28 Sep 2015 08:11:31 +0000
Subject: [PATCH 044/130] * Calendar/CalDAV: fix Outlook does not import
 invitations with wired error "organizer needs not to send responses" caused
 by new Horde Icalendar class exporting all integer x-properties as empty
 string, casting X-EGROUPWARE-UID not explicit to string before passing it to
 Horde code

---
 calendar/inc/class.calendar_ical.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 6d38fc7bd7..052652cdb2 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -459,7 +459,7 @@ class calendar_ical extends calendar_boupdate
 								$organizerURL = $participantURL;
 								$rsvp = '';
 								$organizerCN = $participantCN;
-								$organizerUID = ($info['type'] != 'e' ? $uid : '');
+								$organizerUID = ($info['type'] != 'e' ? (string)$uid : '');
 							}
 							// PARTSTAT={NEEDS-ACTION|ACCEPTED|DECLINED|TENTATIVE|DELEGATED|COMPLETED|IN-PROGRESS} everything from delegated is NOT used by eGW atm.
 							$status = $this->status_egw2ical[$status];
@@ -480,7 +480,7 @@ class calendar_ical extends calendar_boupdate
 											'PARTSTAT'	=> 'NEEDS-ACTION',
 											'CUTYPE'	=> 'INDIVIDUAL',
 											'RSVP'		=> 'TRUE',
-											'X-EGROUPWARE-UID'	=> $this->user,
+											'X-EGROUPWARE-UID'	=> (string)$this->user,
 			    						);
 			    						$event['participants'][$this->user] = true;
 									}
@@ -517,8 +517,8 @@ class calendar_ical extends calendar_boupdate
 							{
 								$options['EMAIL'] = $info['email'];	// only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
 							}
-							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = $uid;
-							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = $quantity;
+							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
+							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
 							$attributes['ATTENDEE'][] = $participantURL;
 							$parameters['ATTENDEE'][] = $options;
 						}

From 1d43c74ea6af329f2ed24f7efb3e3ed7bd9cbf1b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 28 Sep 2015 09:34:09 +0000
Subject: [PATCH 045/130] WIP EGroupware tutorial: - Make sure to not create
 etemplate2 object for an empty container - Fix fallback lang not working

---
 phpgwapi/js/jsapi/app_base.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index 4f5eed5dbd..36f874ba55 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -1018,6 +1018,8 @@ var AppJS = Class.extend(
 	{
 		//DOM container
 		var div = document.getElementById('egw_tutorial_'+egw.app_name()+'_sidebox');
+		if (!div) return;
+		
 		// et2 object
 		var etemplate = new etemplate2 (div, false);
 		var template = egw.webserverUrl+'/etemplate/templates/default/egw_tutorial.xet';
@@ -1027,7 +1029,7 @@ var AppJS = Class.extend(
 			var content = {content:{list:[]}};
 			if (_data && _data[egw.app_name()])
 			{
-				if (_data[egw.app_name()][lang] == 'undefined' || _data[egw.app_name()][lang].length == 0 ) lang = 'en';
+				if (!_data[egw.app_name()][lang]) lang = 'en';
 				if (typeof _data[egw.app_name()][lang] !='undefined' 
 					&& _data[egw.app_name()][lang].length > 0)
 				{

From 7a4a5ac07601a9728d201b16d86005b054ec9fbd Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 28 Sep 2015 12:25:56 +0000
Subject: [PATCH 046/130] WIP EGroupware tutorial: - Add css class to
 egw_tutorial div container

---
 phpgwapi/inc/class.hooks.inc.php         | 2 +-
 pixelegg/css/mobile.css                  | 6 ++++++
 pixelegg/css/pixelegg.css                | 6 ++++++
 pixelegg/less/layout_raster_sidebar.less | 7 ++++++-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index 18c2c64f3e..018ea16067 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -389,7 +389,7 @@ class hooks
 	{
 		$file = Array (
 			array(
-				'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox"/>',
+				'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
 				'no_lang' => true,
 				'link'    => false,
 				'icon'    => false,
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 002f553f3f..a4c92caa92 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -5123,6 +5123,12 @@ td.message span.message {
   height: 16px;
   vertical-align: middle;
 }
+.egw_fw_ui_category_content .egwTutorial div#list_grid_wrapper {
+  border-bottom-left-radius: 10px;
+}
+.egw_fw_ui_category_content .egwTutorial div#list_grid_wrapper .et2_label {
+  padding-bottom: 5px;
+}
 .egw_fw_ui_sidemenu_listitem {
   padding: 9px 0px 0px 0px;
   margin: 0px 0 1px 0px;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index df43057f9d..3778d4105e 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -5112,6 +5112,12 @@ td.message span.message {
   height: 16px;
   vertical-align: middle;
 }
+.egw_fw_ui_category_content .egwTutorial div#list_grid_wrapper {
+  border-bottom-left-radius: 10px;
+}
+.egw_fw_ui_category_content .egwTutorial div#list_grid_wrapper .et2_label {
+  padding-bottom: 5px;
+}
 .egw_fw_ui_sidemenu_listitem {
   padding: 9px 0px 0px 0px;
   margin: 0px 0 1px 0px;
diff --git a/pixelegg/less/layout_raster_sidebar.less b/pixelegg/less/layout_raster_sidebar.less
index 298e49fab4..06d78f400d 100644
--- a/pixelegg/less/layout_raster_sidebar.less
+++ b/pixelegg/less/layout_raster_sidebar.less
@@ -521,7 +521,12 @@
     // Favoriten anlegen und löschen
     .sidebox-favorites{} // ist in etemplate2.less definiert
 
-
+	.egwTutorial div#list_grid_wrapper {
+		border-bottom-left-radius: 10px;
+		.et2_label {
+			padding-bottom: 5px;
+		}
+	}
 }
 
 

From b49a967cf14a120180377c21073bf0745ec4d22f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 28 Sep 2015 13:15:36 +0000
Subject: [PATCH 047/130] we can NOT use 204 No content (forbidds a body) with
 return=representation, therefore we need to use 200 Ok instead

---
 phpgwapi/inc/class.groupdav.inc.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php
index 2678458fc9..519535a117 100644
--- a/phpgwapi/inc/class.groupdav.inc.php
+++ b/phpgwapi/inc/class.groupdav.inc.php
@@ -1659,9 +1659,13 @@ class groupdav extends HTTP_WebDAV_Server
 			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
 
 			// check/handle Prefer: return-representation
-			if ($status[0] === '2')
+			if ($status[0] === '2' || $status === true)
 			{
-				$handler->check_return_representation($options, $id, $user);
+				// we can NOT use 204 No content (forbidds a body) with return=representation, therefore we need to use 200 Ok instead!
+				if ($handler->check_return_representation($options, $id, $user) && (int)$status == 204)
+				{
+					$status = '200 Ok';
+				}
 			}
 			return $status;
 		}

From a6d933e3eddfc45483287c329cd5328b32717301 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Sep 2015 17:05:35 +0000
Subject: [PATCH 048/130] Tracker CRM view fixes: - Do not lose called by when
 submitting, fixes tracker CRM view switching to all tickets when changing
 single/multi queue - Fix js error using sidebox toolbar - Fix wrong selectbox
 options in tracker nm when there are no rows for the entry

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

diff --git a/addressbook/js/app.js b/addressbook/js/app.js
index dbe859e9e0..cd5d244975 100644
--- a/addressbook/js/app.js
+++ b/addressbook/js/app.js
@@ -51,7 +51,7 @@ app.classes.addressbook = AppJS.extend(
 		// r49769 let's CRM view run under currentapp == "addressbook", which causes
 		// app.addressbook.et2_ready called before app.infolog.et2_ready and therefore
 		// app.addressbook.et2 would point to infolog template, if we not stop here
-		if (name.match(/^infolog\./)) return;
+		if (name.match(/^infolog|tracker\./)) return;
 
 		// call parent
 		this._super.apply(this, arguments);

From b7f7c40d28e4831eebc02719c2a71e0f8721a1e9 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Sep 2015 17:31:30 +0000
Subject: [PATCH 049/130] Always show weekends in month view

---
 calendar/js/app.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index cbc2dd14e8..7b7d8d7f94 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -2366,7 +2366,7 @@ app.classes.calendar = AppJS.extend(
 					// Set to week view, if in one of the views where we change view
 					if(app.calendar.sidebox_changes_views.indexOf(view) >= 0)
 					{
-						app.calendar.update_state({view: 'week', date: date.getValue()});
+						app.calendar.update_state({view: 'week', date: date.getValue(), days: false});
 					}
 					else if (app.calendar.state.view == 'planner')
 					{
@@ -2689,6 +2689,10 @@ jQuery.extend(app.classes.calendar,{
 				var d = new Date(app.calendar.state.date);
 				d.setUTCMonth(d.getUTCMonth() + delta);
 				return d;
+			},
+			show_weekend: function(state)
+			{
+				return true;
 			}
 		}),
 

From 533ad2cc0e5266a990b4e52bc53ccd31d191345e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Sep 2015 17:45:24 +0000
Subject: [PATCH 050/130] Allow taller nextmatch headers

---
 pixelegg/css/mobile.css         | 13 +++++++------
 pixelegg/css/pixelegg.css       | 11 ++++++-----
 pixelegg/less/layout_table.less |  8 +++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index a4c92caa92..1e7b97def3 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -2196,6 +2196,7 @@ body {
  * @package pixelegg
  * @version $Id$
  */
+@import-once "def_colors.less";
 #socialMedia {
   position: relative;
   bottom: 20px;
@@ -4273,7 +4274,7 @@ td.message span.message {
   text-decoration: none;
   height: 32px;
   /*font-size: 1.1em;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 1.5em;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
@@ -4297,7 +4298,7 @@ td.message span.message {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before {
   padding-right: 20px;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   content: " ";
   background-image: url(../images/topmenu_items/home.png);
   background-repeat: no-repeat;
@@ -4693,7 +4694,7 @@ td.message span.message {
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
@@ -4865,7 +4866,7 @@ td.message span.message {
   margin: 5px 0px 3px 5px;
   padding: 0px 0px 0px 15px;
   line-height: 1em;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   background-image: url(../images/arrow_left.png);
   background-repeat: no-repeat;
   background-position: left center;
@@ -5899,7 +5900,7 @@ table.egwGridView_outer thead tr th:active {
   border-bottom: 1px solid silver;
 }
 table.egwGridView_outer thead tr th div.innerContainer {
-  max-height: 7em;
+  max-height: 10em;
   overflow-y: auto;
 }
 table.egwGridView_outer thead tr th.optcol {
@@ -6925,7 +6926,7 @@ a.textSidebox {
     margin: 5px 0px 3px 5px;
     padding: 0px 0px 0px 15px;
     line-height: 1em;
-    font-size: 12.1px;
+    font-size: 12.100000000000001px;
     background-image: url(../images/arrow_left.png);
     background-repeat: no-repeat;
     background-position: left center;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 3778d4105e..5d350d80f5 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -2185,6 +2185,7 @@ body {
  * @package pixelegg
  * @version $Id$
  */
+@import-once "def_colors.less";
 #socialMedia {
   position: relative;
   bottom: 20px;
@@ -4262,7 +4263,7 @@ td.message span.message {
   text-decoration: none;
   height: 32px;
   /*font-size: 1.1em;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 1.5em;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
@@ -4286,7 +4287,7 @@ td.message span.message {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before {
   padding-right: 20px;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   content: " ";
   background-image: url(../images/topmenu_items/home.png);
   background-repeat: no-repeat;
@@ -4682,7 +4683,7 @@ td.message span.message {
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
@@ -4854,7 +4855,7 @@ td.message span.message {
   margin: 5px 0px 3px 5px;
   padding: 0px 0px 0px 15px;
   line-height: 1em;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   background-image: url(../images/arrow_left.png);
   background-repeat: no-repeat;
   background-position: left center;
@@ -5888,7 +5889,7 @@ table.egwGridView_outer thead tr th:active {
   border-bottom: 1px solid silver;
 }
 table.egwGridView_outer thead tr th div.innerContainer {
-  max-height: 7em;
+  max-height: 10em;
   overflow-y: auto;
 }
 table.egwGridView_outer thead tr th.optcol {
diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less
index 208d0c40af..730641664a 100755
--- a/pixelegg/less/layout_table.less
+++ b/pixelegg/less/layout_table.less
@@ -118,11 +118,9 @@ table.egwGridView_outer{
                 }
 
                 div.innerContainer {
-                                        max-height: 7em;
-                                        overflow-y: auto;
-                                    }
-
-
+					max-height: 10em;
+					overflow-y: auto;
+				}
             }
 
             th.optcol {

From 815b6bc09a144e15d129ed67f6898012cf77b4d2 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Sep 2015 19:31:01 +0000
Subject: [PATCH 051/130] Calendar bugs with multi-day events: - Fix not
 properly visible if they span weeks - Fix end date changes when editing if
 the event spans DST (daylight savings time) change

---
 calendar/js/app.js               |  6 ++++--
 calendar/js/et2_widget_daycol.js | 11 +++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 7b7d8d7f94..0b9e1c680f 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -685,7 +685,9 @@ app.classes.calendar = AppJS.extend(
 		if (typeof duration != 'undefined' && typeof end != 'undefined')
 		{
 			end.set_disabled(duration.get_value()!=='');
-			if (!end.disabled )
+			
+			// Only set end date if not provided, adding seconds fails with DST
+			if (!end.disabled && !content.end)
 			{
 				end.set_value(start.get_value());
 				if (typeof content.duration != 'undefined') end.set_value("+"+content.duration);
@@ -2025,7 +2027,7 @@ app.classes.calendar = AppJS.extend(
 
 							do
 							{
-								var expanded_date = ''+t.getUTCFullYear() + sprintf('%02d',t.getUTCMonth()+1) + sprintf('%02d',t.getDate());
+								var expanded_date = ''+t.getUTCFullYear() + sprintf('%02d',t.getUTCMonth()+1) + sprintf('%02d',t.getUTCDate());
 								if(typeof(updated_days[expanded_date]) === 'undefined')
 								{
 									updated_days[expanded_date] = [];
diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js
index 6a2a307ece..290c321ec7 100644
--- a/calendar/js/et2_widget_daycol.js
+++ b/calendar/js/et2_widget_daycol.js
@@ -237,7 +237,11 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 			for(var i = 0; i < event_ids.length; i++)
 			{
 				var event = egw.dataGetUIDdata('calendar::'+event_ids[i]).data;
-				if(event && event.date && event.date === this.options.date)
+				if(event && event.date && (
+					event.date === this.options.date ||
+					// Accept multi-day events
+					new Date(event.start) <= this.date //&& new Date(event.end) >= this.date
+				))
 				{
 					events.push(event);
 				}
@@ -420,7 +424,10 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 		{
 			var event = this._children[i].options.value || false;
 			if(!event) continue;
-			if(event.date && event.date != this.options.date)
+			if(event.date && event.date != this.options.date && 
+				// Multi-day events date may be different
+				(new Date(event.start) >= this.date || new Date(event.end) <= this.date )
+			)
 			{
 				// Still have a child event that has changed date (DnD)
 				this._children[i].destroy();

From eef843185bf49e9b0b6802fceecf333652bf8636 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Sep 2015 20:06:21 +0000
Subject: [PATCH 052/130] Fix unable to change group run rights

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

diff --git a/admin/js/app.js b/admin/js/app.js
index 6f3ebab143..9171fdd1d2 100644
--- a/admin/js/app.js
+++ b/admin/js/app.js
@@ -530,8 +530,9 @@ app.classes.admin = AppJS.extend(
 						var removed = [];
 
 						// Loop through all apps, remove the ones with no permission
-						for(var app in sel_options.filter2)
+						for(var idx in sel_options.filter2)
 						{
+							var app = sel_options.filter2[idx].value || false;
 							if (!app) continue;
 							var run_id = app+":"+_value.acl_account+":run";
 							if(_value.apps.indexOf(app) < 0 && (content.apps.indexOf(app) >= 0 || content.apps.length == 0))

From 17b9b5912eb3f2d74aaf64ce7a059c2072a1a6b2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 29 Sep 2015 07:31:45 +0000
Subject: [PATCH 053/130] fix warning if there are no participants

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

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index d0d7d2b4ef..8fe7bba507 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1221,7 +1221,7 @@ class calendar_boupdate extends calendar_bo
 		}
 
 		// create links for new participants from addressbook, if configured
-		if ($cal_id && $GLOBALS['egw_info']['server']['link_contacts'])
+		if ($cal_id && $GLOBALS['egw_info']['server']['link_contacts'] && $event['participants'])
 		{
 			foreach($event['participants'] as $uid => $status)
 			{

From b34cbded3aa465d8bb4bcbf4aef8459211c3675e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 29 Sep 2015 07:37:15 +0000
Subject: [PATCH 054/130] multiple fixes around managed attachments and new
 Horde_Icalendar: - no longer decodes base64 automatic - size param have to be
 string due to bug in handling of integers in Horde_Icalendar - allow
 stripping of non-binary (eg. text/plain) inline attachments - only add
 X-EGROUPWARE-ATTACH-INCLUDED, if we have a real managed attachment - store
 external / url attachments as other unsupported attributes

---
 calendar/inc/class.calendar_ical.inc.php |  3 +++
 phpgwapi/inc/class.groupdav.inc.php      | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 052652cdb2..cb4ab1a13e 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -2978,6 +2978,9 @@ class calendar_ical extends calendar_boupdate
 				case 'X-LIC-ERROR':	// parse errors from libical, makes no sense to store them
 					break;
 
+				case 'ATTACH':
+					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break;	// handeled by managed attachment code
+					// fall throught to store external attachment url
 				default:	// X- attribute or other by EGroupware unsupported property
 					//error_log(__METHOD__."() $attributes[name] = ".array2string($attributes));
 					// for attributes with multiple values in multiple lines, merge the values
diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php
index 519535a117..84c2040672 100644
--- a/phpgwapi/inc/class.groupdav.inc.php
+++ b/phpgwapi/inc/class.groupdav.inc.php
@@ -1382,10 +1382,11 @@ class groupdav extends HTTP_WebDAV_Server
 		// turn inline attachments into managed ones
 		foreach($attach as $key => $attr)
 		{
-			if ($attr['params']['VALUE'] === 'BINARY')
+			if (!empty($attr['params']['FMTTYPE']))
 			{
 				if (!($to = self::fopen_attachment($app, $id, $filename=$attr['params']['FILENAME'], $attr['params']['FMTTYPE'], $path)) ||
-					($copied=fwrite($to, $attr['value'])) === false)
+					// Horde Icalendar does NOT decode automatic
+					($copied=fwrite($to, $attr['params']['ENCODING'] == 'BASE64' ? base64_decode($attr['value']) : $attr['value'])) === false)
 				{
 					error_log(__METHOD__."('$app', $id, ...) failed to add attachment ".array2string($attr).") ");
 					continue;
@@ -1484,13 +1485,13 @@ class groupdav extends HTTP_WebDAV_Server
 			$parameters['ATTACH'][] = array(
 				'MANAGED-ID' => groupdav::path2managed_id($path),
 				'FMTTYPE'    => $stat['mime'],
-				'SIZE'       => $stat['size'],
+				'SIZE'       => (string)$stat['size'],	// Horde_Icalendar renders int as empty string
 				'FILENAME'   => egw_vfs::basename($path),
 			);
+			// if we have attachments, set X-attribute to enable deleting them by put
+			// (works around events synced before without ATTACH attributes)
+			$attributes['X-EGROUPWARE-ATTACH-INCLUDED'] = 'TRUE';
 		}
-		// if we have attachments, set X-attribute to enable deleting them by put
-		// (works around events synced before without ATTACH attributes)
-		if ($attributes['ATTACH']) $attributes['X-EGROUPWARE-ATTACH-INCLUDED'] = 'TRUE';
 	}
 
 	/**

From 8d476dae23e5c4cfafa11cfc42385fc8b4e04976 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 29 Sep 2015 10:25:32 +0000
Subject: [PATCH 055/130] Several fixed to cope better with CalDAVTester: -
 adding priority=0=undefined to calendar, as it is iCalendar default - no
 longer export iCalendar defaults PRIORITY=0, TRANSP=OPAQUE, CLASS=PUBLIC -
 assume UTC if no timezone given, unfortunatly Horde_Icalendar currently does
 not tell UTC or local - export DURATION instead of DTEND for UTC and duration
 less or equal 1 day (todo: store if user entered duration in db model, to be
 able export it as such again)

---
 calendar/inc/class.calendar_ical.inc.php | 17 +++++++++++++++--
 etemplate/js/et2_widget_selectbox.js     |  3 ++-
 phpgwapi/lang/egw_de.lang                |  1 +
 phpgwapi/lang/egw_en.lang                |  1 +
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index cb4ab1a13e..96e20a3c4b 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -525,6 +525,7 @@ class calendar_ical extends calendar_boupdate
 						break;
 
 					case 'CLASS':
+						if ($event['public']) continue;	// public is default, no need to export, fails CalDAVTester if added as default
 						$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
 						// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
 						if (!$event['public'] && $this->productManufacturer == 'groupdav')
@@ -585,6 +586,10 @@ class calendar_ical extends calendar_boupdate
 					case 'DTEND':
 						if (empty($event['whole_day']))
 						{
+							// Hack for CalDAVTester to export duration instead of endtime
+							if ($tzid == 'UTC' && $event['end'] - $event['start'] <= 86400)
+								$attributes['duration'] = $event['end'] - $event['start'];
+							else
 							$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
 						}
 						else
@@ -677,6 +682,7 @@ class calendar_ical extends calendar_boupdate
 						break;
 
 					case 'PRIORITY':
+						if (!$event['priority']) continue;	// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
 						if ($this->productManufacturer == 'funambol' &&
 							(strpos($this->productName, 'outlook') !== false
 								|| strpos($this->productName, 'pocket pc') !== false))
@@ -690,6 +696,7 @@ class calendar_ical extends calendar_boupdate
 						break;
 
 					case 'TRANSP':
+						if (!$event['non_blocking']) continue;	// OPAQUE is default, no need to export, fails CalDAVTester if added as default
 						if ($version == '1.0')
 						{
 							$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
@@ -2368,6 +2375,7 @@ class calendar_ical extends calendar_boupdate
 		$vcardData	= array(
 			'recur_type'		=> MCAL_RECUR_NONE,
 			'recur_exception'	=> array(),
+			'priority'          => 0,	// iCalendar default is 0=undefined, not EGroupware 5=normal
 		);
 		// we need to parse DTSTART, DTEND or DURATION (in that order!) first
 		foreach (array_merge(
@@ -2392,8 +2400,6 @@ class calendar_ical extends calendar_boupdate
 					}
 					else
 					{
-						$event['tzid'] =  date_default_timezone_get();
-
 						if (!empty($attributes['params']['TZID']))
 						{
 							// import TZID, if PHP understands it (we only care about TZID of starttime,
@@ -2423,6 +2429,13 @@ class calendar_ical extends calendar_boupdate
 								$event['tzid'] = date_default_timezone_get();	// default to current timezone
 							}
 						}
+						else
+						{
+							// Horde seems not to distinguish between an explicit UTC time postfixed with Z and one without
+							// assuming for now UTC to pass CalDAVTester tests
+							// ToDo: fix Horde_Icalendar to return UTC for timestamp postfixed with Z
+							$event['tzid'] = 'UTC';
+						}
 					}
 					break;
 
diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js
index 3bed3f2c18..c526c482f3 100644
--- a/etemplate/js/et2_widget_selectbox.js
+++ b/etemplate/js/et2_widget_selectbox.js
@@ -941,7 +941,8 @@ jQuery.extend(et2_selectbox,
 		return [
 			{value: 1, label: 'low'},
 			{value: 2, label: 'normal'},
-			{value: 3, label: 'high'}
+			{value: 3, label: 'high'},
+			{value: 0, label: 'undefined'}
 		];
 	},
 	bool_options: function(widget) {
diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang
index 949f5c5500..2fced1bd79 100644
--- a/phpgwapi/lang/egw_de.lang
+++ b/phpgwapi/lang/egw_de.lang
@@ -874,6 +874,7 @@ uganda	common	de	UGANDA
 ukraine	common	de	UKRAINE
 un-delete	common	de	Gelöschte Einträge wiederherstellen
 unconnected nodes will be moved to %1.	admin	de	Nicht Verbundene Knoten werden nach %1 verschoben.
+undefined	common	de	unbestimmt
 underline	common	de	Unterstrichen
 unicode	common	de	Unicode
 united arab emirates	common	de	VEREINIGTEN ARABISCHEN EMIRATE
diff --git a/phpgwapi/lang/egw_en.lang b/phpgwapi/lang/egw_en.lang
index c9e8b3c820..5d865d1468 100644
--- a/phpgwapi/lang/egw_en.lang
+++ b/phpgwapi/lang/egw_en.lang
@@ -874,6 +874,7 @@ uganda	common	en	UGANDA
 ukraine	common	en	UKRAINE
 un-delete	common	en	Un-Delete
 unconnected nodes will be moved to %1.	admin	en	Unconnected nodes will be moved to %1.
+undefined	common	en	undefined
 underline	common	en	Underline
 unicode	common	en	Unicode
 united arab emirates	common	en	UNITED ARAB EMIRATES

From 5e2ec5b8d279ea84ab70534c2f831bf7e11a3a75 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 29 Sep 2015 12:14:41 +0000
Subject: [PATCH 056/130] Fix split widget does not take right size

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

diff --git a/etemplate/js/et2_widget_split.js b/etemplate/js/et2_widget_split.js
index 3779280516..f05b536a44 100644
--- a/etemplate/js/et2_widget_split.js
+++ b/etemplate/js/et2_widget_split.js
@@ -295,7 +295,7 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable,et2_IPrint],
 				{
 					// Store current position in preferences
 					var size = self.orientation == "v" ? {sizeLeft: self.left.width()} : {sizeTop: self.left.height()};
-					self.prefSize = size[this.orientation == "v" ?'sizeLeft' : 'sizeTop'];
+					self.prefSize = size[self.orientation == "v" ?'sizeLeft' : 'sizeTop'];
 					var prefInPercent = self.orientation == "v" ?{sizeLeft:pix2per(size.sizeLeft)}:{sizeTop:pix2per(size.sizeTop)};
 					self.egw().set_preference(self.egw().getAppName(), 'splitter-size-' + self.id, prefInPercent);
 				}

From afa106cbf3eeb031d0c0344d51342ee63c59e194 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 29 Sep 2015 12:27:49 +0000
Subject: [PATCH 057/130] fix CalDAVTester failure: managed-attachments: Simple
 non-recurring, non-scheduled update attachment: Test 4: rename of attachment
 via Content-Disposition:filename=

---
 phpgwapi/inc/class.groupdav.inc.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php
index 84c2040672..445c6a7bea 100644
--- a/phpgwapi/inc/class.groupdav.inc.php
+++ b/phpgwapi/inc/class.groupdav.inc.php
@@ -1304,6 +1304,19 @@ class groupdav extends HTTP_WebDAV_Server
 				}
 				else
 				{
+					// check for rename of attachment via Content-Disposition:filename=
+					if (isset($this->_SERVER['HTTP_CONTENT_DISPOSITION']) &&
+						substr($this->_SERVER['HTTP_CONTENT_DISPOSITION'], 0, 10) === 'attachment' &&
+						preg_match('/filename="?([^";]+)/', $this->_SERVER['HTTP_CONTENT_DISPOSITION'], $matches) &&
+						($filename = egw_vfs::basename($matches[1])) != egw_vfs::basename($path))
+					{
+						$old_path = $path;
+						if (!egw_vfs::rename($old_path, $path = egw_vfs::concat(egw_vfs::dirname($path), $filename)))
+						{
+							self::xml_error(self::mkprop(self::CALDAV, 'valid-managed-id-parameter', ''));
+							return '403 Forbidden';
+						}
+					}
 					if (!($to = egw_vfs::fopen($path, 'w')) ||
 						isset($options['stream']) && ($copied=stream_copy_to_stream($options['stream'], $to)) === false ||
 						isset($options['content']) && ($copied=fwrite($to, $options['content'])) === false)

From f1837813a4e5d7499947b20df06d0f4eb486de2b Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 29 Sep 2015 15:15:45 +0000
Subject: [PATCH 058/130] Fix ACL error allowing regular users to delete global
 categories

---
 admin/inc/class.admin_categories.inc.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/admin/inc/class.admin_categories.inc.php b/admin/inc/class.admin_categories.inc.php
index 7f6fb7c875..3c2211fc39 100644
--- a/admin/inc/class.admin_categories.inc.php
+++ b/admin/inc/class.admin_categories.inc.php
@@ -369,6 +369,17 @@ class admin_categories
 			{
 				$row['class'] .= ' rowNoEdit rowNoDelete ';
 			}
+			else if (!$GLOBALS['egw_info']['user']['apps']['admin'])
+			{
+				if(!$cats->check_perms(EGW_ACL_EDIT, $row['id']))
+				{
+					$row['class'] .= ' rowNoEdit';
+				}
+				if(!$cats->check_perms(EGW_ACL_DELETE, $row['id']))
+				{
+					$row['class'] .= ' rowNoDelete';
+				}
+			}
 			// Can only edit (via context menu) categories for the selected app (backend restriction)
 			if($row['appname'] != $query['appname'] || (array_sum($row['owner']) > 0))
 			{
@@ -661,11 +672,18 @@ class admin_categories
 		switch($action)
 		{
 			case 'delete':
+				$action_msg = lang('deleted');
 				foreach($checked as $id)
 				{
-					$cats->delete($id,$settings == 'sub',$settings != 'sub');
-					$action_msg = lang('deleted');
-					$success++;
+					if($cats->check_perms(EGW_ACL_DELETE, $id, (boolean)$GLOBALS['egw_info']['user']['apps']['admin']))
+					{
+						$cats->delete($id,$settings == 'sub',$settings != 'sub');
+						$success++;
+					}
+					else
+					{
+						$failed++;
+					}
 				}
 				break;
 			case 'owner':

From dde1a5e51dea19a9fe568ecfd5fe79e3adf16a18 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 29 Sep 2015 16:00:12 +0000
Subject: [PATCH 059/130] Pass current selectbox value so the server can make
 sure it's there

---
 .../class.etemplate_widget_menupopup.inc.php  |  7 ++++---
 etemplate/js/et2_widget_selectbox.js          | 20 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_menupopup.inc.php b/etemplate/inc/class.etemplate_widget_menupopup.inc.php
index 6dd951b5b3..1d82a09d29 100644
--- a/etemplate/inc/class.etemplate_widget_menupopup.inc.php
+++ b/etemplate/inc/class.etemplate_widget_menupopup.inc.php
@@ -831,11 +831,12 @@ class etemplate_widget_menupopup extends etemplate_widget
 	 *
 	 * @param string $type
 	 * @param Array|String $attributes
-	 *
+	 * @param string $value Optional current value, to make sure it's included
 	 */
-	public static function ajax_get_options($type, $attributes)
+	public static function ajax_get_options($type, $attributes, $value = null)
 	{
-		$options = self::typeOptions($type, $attributes);
+		$no_lang = false;
+		$options = self::typeOptions($type, $attributes,$no_lang,false,$value);
 		self::fix_encoded_options($options,true);
 		$response = egw_json_response::get();
 		$response->data($options);
diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js
index c526c482f3..fac1e83c0b 100644
--- a/etemplate/js/et2_widget_selectbox.js
+++ b/etemplate/js/et2_widget_selectbox.js
@@ -1103,7 +1103,7 @@ jQuery.extend(et2_selectbox,
 			// and we can't do that when it's queued.
 			egw.window.et2_selectbox.type_cache[cache_id] = egw.json(
 				widget.getInstanceManager().app+'.etemplate_widget_menupopup.ajax_get_options.etemplate',
-				[widget._type,options_string]
+				[widget._type,options_string,attrs.value]
 			).sendRequest(true);
 		}
 		cache = egw.window.et2_selectbox.type_cache[cache_id];
@@ -1128,6 +1128,24 @@ jQuery.extend(et2_selectbox,
 		}
 		else
 		{
+			// Check that the value is in there
+			if(attrs.value)
+			{
+				var missing_option = true;
+				for(var i = 0; i < cache.length && missing_option; i++)
+				{
+					if(cache[i].value == attrs.value)
+					{
+						missing_option = false;
+					}
+				}
+				// Try again - ask the server with the current value this time
+				if(missing_option)
+				{
+					delete egw.window.et2_selectbox.type_cache[cache_id];
+					return this.cached_server_side_options(widget, options_string, attrs);
+				}
+			}
 			return cache;
 		}
 	}

From 0438456ad37e08d9babb633c921780560de3a09c Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 29 Sep 2015 16:21:05 +0000
Subject: [PATCH 060/130] Prevent apps from modifying favorites by reference.

Fixes projectmanager favorites stop working
---
 phpgwapi/js/jsapi/app_base.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index 36f874ba55..637e5eca84 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -390,7 +390,8 @@ var AppJS = Class.extend(
 					var pref = egw.preference('favorite_' + this.dataset.id, self.appname);
 					if(pref)
 					{
-						state = pref;
+						// Extend, to prevent changing the preference by reference
+						jQuery.extend(true, state, pref);
 					}
 					if(this.dataset.id != 'add')
 					{

From fa62547d77fa027aadd37a122f81dbbc69005d16 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 29 Sep 2015 16:50:49 +0000
Subject: [PATCH 061/130] Keep user's last choice for weekend in week view

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

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 0b9e1c680f..fffe9213d1 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -2361,6 +2361,7 @@ app.classes.calendar = AppJS.extend(
 				})
 				.on('click', '.ui-datepicker-week-col', function() {
 					var view = app.calendar.state.view;
+					var days = app.calendar.state.days;
 
 					// Fake a click event on the first day to get the updated date
 					$j(this).next().click();
@@ -2368,7 +2369,7 @@ app.classes.calendar = AppJS.extend(
 					// Set to week view, if in one of the views where we change view
 					if(app.calendar.sidebox_changes_views.indexOf(view) >= 0)
 					{
-						app.calendar.update_state({view: 'week', date: date.getValue(), days: false});
+						app.calendar.update_state({view: 'week', date: date.getValue(), days: days});
 					}
 					else if (app.calendar.state.view == 'planner')
 					{

From c34ebcf9b269fd1b2fb170ec3d1016bb1ff6ee32 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 30 Sep 2015 03:24:04 +0000
Subject: [PATCH 062/130] fixed creating of symlink failed for not-writable
 entry-directory (attachments), because wrong url_stat was used, needs to be
 static::url_stat not self::, to use method of extending classes

---
 api/src/Vfs/Sqlfs/StreamWrapper.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/api/src/Vfs/Sqlfs/StreamWrapper.php b/api/src/Vfs/Sqlfs/StreamWrapper.php
index afad915ad3..efbfd84368 100644
--- a/api/src/Vfs/Sqlfs/StreamWrapper.php
+++ b/api/src/Vfs/Sqlfs/StreamWrapper.php
@@ -1306,11 +1306,16 @@ class StreamWrapper implements Vfs\StreamWrapperIface
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$target','$link')");
 
-		if (self::url_stat($link,0) || !($dir = Vfs::dirname($link)) ||
-			!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=self::url_stat($dir,0)))
+		if (self::url_stat($link,0))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') returning false! (!stat('$link') || !is_writable('$dir'))");
-			return false;	// $link already exists or parent dir does not
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') $link exists, returning false!");
+			return false;	// $link already exists
+		}
+		if (!($dir = Vfs::dirname($link)) ||
+			!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=static::url_stat($dir,0)))
+		{
+			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$target','$link') returning false! (!is_writable('$dir'), dir_stat=".array2string($dir_stat).")");
+			return false;	// parent dir does not exist or is not writable
 		}
 		$query = 'INSERT INTO '.self::TABLE.' (fs_name,fs_dir,fs_mode,fs_uid,fs_gid,fs_created,fs_modified,fs_creator,fs_mime,fs_size,fs_link'.
 			') VALUES (:fs_name,:fs_dir,:fs_mode,:fs_uid,:fs_gid,:fs_created,:fs_modified,:fs_creator,:fs_mime,:fs_size,:fs_link)';

From c6ad6d2caaa1e5491b50a89dc12b230c492ee60a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 30 Sep 2015 03:27:29 +0000
Subject: [PATCH 063/130] allow to reuse managed-id of existing attachment in
 PUT request by symlinking it, return correct xml-error for invalid
 mananaged-id

---
 calendar/inc/class.calendar_ical.inc.php |  6 ++--
 phpgwapi/inc/class.groupdav.inc.php      | 41 ++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 96e20a3c4b..f61c085d39 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -1099,7 +1099,7 @@ class calendar_ical extends calendar_boupdate
 	 * @param string $charset  The encoding charset for $text. Defaults to
 	 *                         utf-8 for new format, iso-8859-1 for old format.
 	 * @param string $caldav_name=null name from CalDAV client or null (to use default)
-	 * @return int|boolean cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied
+	 * @return int|boolean|null cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied or null for "403 Forbidden"
 	 */
 	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null, $caldav_name=null,$skip_notification=false)
 	{
@@ -1743,9 +1743,9 @@ class calendar_ical extends calendar_boupdate
 			}
 
 			// handle ATTACH attribute for managed attachments
-			if ($updated_id)
+			if ($updated_id && groupdav::handle_attach('calendar', $updated_id, $event['attach'], $event['attach-delete-by-put']) === false)
 			{
-				groupdav::handle_attach('calendar', $updated_id, $event['attach'], $event['attach-delete-by-put']);
+				$return_id = null;
 			}
 
 			if ($this->log)
diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php
index 445c6a7bea..67849067c0 100644
--- a/phpgwapi/inc/class.groupdav.inc.php
+++ b/phpgwapi/inc/class.groupdav.inc.php
@@ -216,6 +216,9 @@ class groupdav extends HTTP_WebDAV_Server
 
 	function __construct()
 	{
+		// log which CalDAVTester test is currently running, set as User-Agent header
+		if (substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'scripts/tests/') error_log('****** '.$_SERVER['HTTP_USER_AGENT']);
+
 		if (!$this->debug) $this->debug = (int)$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level'];
 
 		if ($this->debug > 2) error_log('groupdav: $_SERVER='.array2string($_SERVER));
@@ -1359,6 +1362,7 @@ class groupdav extends HTTP_WebDAV_Server
 	 * @param int|string $id
 	 * @param array $attach array of array with values for keys 'name', 'params', 'value'
 	 * @param boolean $delete_via_put
+	 * @return boolean false on error, eg. invalid managed id, for false an xml-error body has been send
 	 */
 	public static function handle_attach($app, $id, $attach, $delete_via_put=false)
 	{
@@ -1397,6 +1401,32 @@ class groupdav extends HTTP_WebDAV_Server
 		{
 			if (!empty($attr['params']['FMTTYPE']))
 			{
+				if (isset($attr['params']['MANAGED-ID']))
+				{
+					// invalid managed-id
+					if (!($path = self::managed_id2path($attr['params']['MANAGED-ID'])) || !egw_vfs::is_readable($path))
+					{
+						error_log(__METHOD__."('$app', $id, ...) invalid MANAGED-ID ".array2string($attr));
+						self::xml_error(self::mkprop(self::CALDAV, 'valid-managed-id', ''));
+						return false;
+					}
+					if($path == ($link = egw_link::vfs_path($app, $id, egw_vfs::basename($path))))
+					{
+						error_log(__METHOD__."('$app', $id, ...) trying to modify existing MANAGED-ID --> ignored! ".array2string($attr));
+						continue;
+					}
+					// reuse valid managed-id --> symlink attachment
+					if (egw_vfs::file_exists($link))
+					{
+						if (egw_vfs::readlink($link) === $path) continue;	// no need to recreate identical link
+						egw_vfs::unlink($link);		// symlink will fail, if $link exists
+					}
+					if (!egw_vfs::symlink($path, $link))
+					{
+						error_log(__METHOD__."('$app', $id, ...) failed to symlink($path, $link) --> ignored!");
+					}
+					continue;
+				}
 				if (!($to = self::fopen_attachment($app, $id, $filename=$attr['params']['FILENAME'], $attr['params']['FMTTYPE'], $path)) ||
 					// Horde Icalendar does NOT decode automatic
 					($copied=fwrite($to, $attr['params']['ENCODING'] == 'BASE64' ? base64_decode($attr['value']) : $attr['value'])) === false)
@@ -1494,6 +1524,17 @@ class groupdav extends HTTP_WebDAV_Server
 			'need_mime' => true,
 		), true) as $path => $stat)
 		{
+			// handle symlinks --> return target size and mime-type
+			if (($target = readlink($path)))
+			{
+				if (!($stat = egw_vfs::stat($target))) continue;	// broken or inaccessible symlink
+
+				// check if target is in /apps, probably reused MANAGED-ID --> return it
+				if (substr($target, 0, 6) == '/apps/')
+				{
+					$path = $target;
+				}
+			}
 			$attributes['ATTACH'][] = self::path2location($path);
 			$parameters['ATTACH'][] = array(
 				'MANAGED-ID' => groupdav::path2managed_id($path),

From cb5d0bd419fb741a0e32f5c70487b16257da25e2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 30 Sep 2015 06:24:53 +0000
Subject: [PATCH 064/130] need to use our own readlink

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

diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php
index 67849067c0..1706d550a0 100644
--- a/phpgwapi/inc/class.groupdav.inc.php
+++ b/phpgwapi/inc/class.groupdav.inc.php
@@ -1525,7 +1525,7 @@ class groupdav extends HTTP_WebDAV_Server
 		), true) as $path => $stat)
 		{
 			// handle symlinks --> return target size and mime-type
-			if (($target = readlink($path)))
+			if (($target = egw_vfs::readlink($path)))
 			{
 				if (!($stat = egw_vfs::stat($target))) continue;	// broken or inaccessible symlink
 

From 718dc25815c130952415f86380c48a3c303c5da0 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 30 Sep 2015 15:29:26 +0000
Subject: [PATCH 065/130] Make 100% an invalid preference size, fixes mail
 splitter losing splitter size preference

---
 etemplate/js/et2_widget_split.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_split.js b/etemplate/js/et2_widget_split.js
index f05b536a44..b043b03c9d 100644
--- a/etemplate/js/et2_widget_split.js
+++ b/etemplate/js/et2_widget_split.js
@@ -297,7 +297,10 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable,et2_IPrint],
 					var size = self.orientation == "v" ? {sizeLeft: self.left.width()} : {sizeTop: self.left.height()};
 					self.prefSize = size[self.orientation == "v" ?'sizeLeft' : 'sizeTop'];
 					var prefInPercent = self.orientation == "v" ?{sizeLeft:pix2per(size.sizeLeft)}:{sizeTop:pix2per(size.sizeTop)};
-					self.egw().set_preference(self.egw().getAppName(), 'splitter-size-' + self.id, prefInPercent);
+					if(parseInt(self.orientation == 'v' ? prefInPercent.sizeLeft : prefInPercent.sizeTop) < 100)
+					{
+						self.egw().set_preference(self.egw().getAppName(), 'splitter-size-' + self.id, prefInPercent);
+					}
 				}
 
 				// Ok, update children

From c4861e1194f395b8b33eff7038e4cefb1781fe01 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 30 Sep 2015 16:24:08 +0000
Subject: [PATCH 066/130] Only admins can delete super-global or app-level
 global categories, regardless of owner.

---
 admin/inc/class.admin_categories.inc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/inc/class.admin_categories.inc.php b/admin/inc/class.admin_categories.inc.php
index 3c2211fc39..69a06f2a56 100644
--- a/admin/inc/class.admin_categories.inc.php
+++ b/admin/inc/class.admin_categories.inc.php
@@ -371,11 +371,13 @@ class admin_categories
 			}
 			else if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
-				if(!$cats->check_perms(EGW_ACL_EDIT, $row['id']))
+				if(!$cats->check_perms(EGW_ACL_EDIT, $row['id']) || !self::$acl_edit)
 				{
 					$row['class'] .= ' rowNoEdit';
 				}
-				if(!$cats->check_perms(EGW_ACL_DELETE, $row['id']))
+				if(!$cats->check_perms(EGW_ACL_DELETE, $row['id']) || !self::$acl_delete ||
+					// Only admins can delete globals
+					$cats->is_global($row['id']) && !$GLOBALS['egw_info']['user']['apps']['admin'])
 				{
 					$row['class'] .= ' rowNoDelete';
 				}

From 9d7a566966d7ebe1ff11605831c8becefa7f447e Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 1 Oct 2015 08:27:44 +0000
Subject: [PATCH 067/130] No transition delay for mail, fixes the splitter
 right panel overflows the left panel

---
 mail/templates/pixelegg/app.css  |  8 ++++++++
 mail/templates/pixelegg/app.less | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 07e1725093..3558647cc7 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -2616,3 +2616,11 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
 div.mailComposeHeaderSection > table {
   padding-top: 10px;
 }
+/* transition delay breaks splitter resize, because it doesn't get the right height
+	in a right time. So we reduce the delay to 0 to fix the timing issue.*/
+:hover {
+  -webkit-transition: all 0s ease-out;
+  -moz-transition: all 0s ease-out;
+  -o-transition: all 0s ease-out;
+  transition: all 0s ease-out;
+}
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 8a399d662a..d6339d5ce4 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -1725,4 +1725,12 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
 div.mailComposeHeaderSection > table {
 	padding-top: 10px;
 }
-//
+
+/* transition delay breaks splitter resize, because it doesn't get the right height
+	in a right time. So we reduce the delay to 0 to fix the timing issue.*/
+:hover {
+	-webkit-transition: all 0s ease-out;
+	-moz-transition: all 0s ease-out;
+	-o-transition: all 0s ease-out;
+	transition: all 0s ease-out;
+}
\ No newline at end of file

From 60011b644c0029500bbfde0c4fe9cf9c7788f7d7 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 1 Oct 2015 13:17:41 +0000
Subject: [PATCH 068/130] Resize popup window till not getting horizontal
 scrollbar

---
 phpgwapi/js/jsapi/egw.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js
index 46388f6697..7b5345b276 100644
--- a/phpgwapi/js/jsapi/egw.js
+++ b/phpgwapi/js/jsapi/egw.js
@@ -241,6 +241,11 @@
 			// to take padding/margin into account
 			var delta_width = w.width - ($et2.outerWidth(true) + ($main_div.outerWidth(true) - $main_div.width()));
 			var delta_height = w.height - ($et2.outerHeight(true) + ($main_div.outerHeight(true) - $main_div.height()));
+			
+			// Don't let the window gets horizental scrollbar
+			var scrollWidth = document.body.scrollWidth - document.body.clientWidth;
+			if (scrollWidth > 0 && scrollWidth + egw_getWindowOuterWidth() < screen.availWidth) delta_width = -scrollWidth;
+			
 			if (delta_height && egw_getWindowOuterHeight() >= egw.availHeight())
 			{
 				delta_height = 0;

From 7023d39d981eb667ea227040ab84e9afb356b6ff Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 1 Oct 2015 15:10:38 +0000
Subject: [PATCH 069/130] Add empty_label to Select account custom field type,
 so you can select nothing.

---
 etemplate/js/et2_extension_customfields.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/etemplate/js/et2_extension_customfields.js b/etemplate/js/et2_extension_customfields.js
index deb4cd4f57..895754303a 100644
--- a/etemplate/js/et2_extension_customfields.js
+++ b/etemplate/js/et2_extension_customfields.js
@@ -472,6 +472,11 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
 
 		return true;
 	},
+	_setup_select_account: function(field_name, field, attrs) {
+		attrs.empty_label = egw.lang('Select');
+		return this._setup_select(field_name, field, attrs);
+	},
+	
 	 _setup_date: function(field_name, field, attrs) {
 		attrs.data_format = 'Y-m-d';
 		return true;

From 3060ed09151692f5395219301d24d089aca8be31 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 5 Oct 2015 09:38:25 +0000
Subject: [PATCH 070/130] using (bool) cast instead of php5.5+ boolval()
 function

---
 calendar/inc/class.calendar_ui.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index af180bd551..ad6252875c 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -256,7 +256,7 @@ class calendar_ui
 		// retrieve saved states from prefs
 		$states = is_array($this->bo->cal_prefs['saved_states']) ?
 			$this->bo->cal_prefs['saved_states'] : unserialize($this->bo->cal_prefs['saved_states']);
-		
+
 		// only look at _REQUEST, if we are in the calendar (prefs and admin show our sidebox menu too!)
 		if (is_null($set_states))
 		{
@@ -586,7 +586,7 @@ class calendar_ui
 
 		// Merge print placeholders (selectbox in etemplate)
 		if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'])
-		{			
+		{
 			$file['Placeholders'] = egw::link('/index.php','menuaction=calendar.calendar_merge.show_replacements');
 		}
 		$appname = 'calendar';
@@ -793,7 +793,7 @@ class calendar_ui
 		{
 			$event['category'] = $this->categories->check_list(EGW_ACL_READ, $event['category']);
 		}
-		$event['non_blocking'] = boolval($event['non_blocking']);
+		$event['non_blocking'] = (bool)$event['non_blocking'];
 
 		if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
 		{
@@ -834,7 +834,7 @@ class calendar_ui
 			}
 		}
 	}
-	
+
 	public function merge($timespan = array())
 	{
 		// Merge print

From 7c5ab68b46b43f4b6d7de1aa4b4190a33e1f952e Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 5 Oct 2015 09:38:57 +0000
Subject: [PATCH 071/130] Do not stop completely the transition on mail as it
 conflicts with blueimp gallery plugin (expose)

---
 mail/templates/pixelegg/app.css  | 12 +++++++-----
 mail/templates/pixelegg/app.less | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 3558647cc7..baa069b8ce 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -2617,10 +2617,12 @@ div.mailComposeHeaderSection > table {
   padding-top: 10px;
 }
 /* transition delay breaks splitter resize, because it doesn't get the right height
-	in a right time. So we reduce the delay to 0 to fix the timing issue.*/
+	in a right time. So we reduce the delay to 0.1 to fix the timing issue.
+	The delay should not be set to 0 or none because it wil conflict with blueimp gallery plugin (Expose).
+*/
 :hover {
-  -webkit-transition: all 0s ease-out;
-  -moz-transition: all 0s ease-out;
-  -o-transition: all 0s ease-out;
-  transition: all 0s ease-out;
+  -webkit-transition: all 0.1s ease-out;
+  -moz-transition: all 0.1s ease-out;
+  -o-transition: all 0.1s ease-out;
+  transition: all 0.1s ease-out;
 }
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index d6339d5ce4..e6dd58c1de 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -1727,10 +1727,12 @@ div.mailComposeHeaderSection > table {
 }
 
 /* transition delay breaks splitter resize, because it doesn't get the right height
-	in a right time. So we reduce the delay to 0 to fix the timing issue.*/
+	in a right time. So we reduce the delay to 0.1 to fix the timing issue.
+	The delay should not be set to 0 or none because it wil conflict with blueimp gallery plugin (Expose).
+*/
 :hover {
-	-webkit-transition: all 0s ease-out;
-	-moz-transition: all 0s ease-out;
-	-o-transition: all 0s ease-out;
-	transition: all 0s ease-out;
+	-webkit-transition: all 0.1s ease-out;
+	-moz-transition: all 0.1s ease-out;
+	-o-transition: all 0.1s ease-out;
+	transition: all 0.1s ease-out;
 }
\ No newline at end of file

From 816c9c0a96f81bd64e6770ce1c9f2d5e43fcf5f2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 5 Oct 2015 13:15:17 +0000
Subject: [PATCH 072/130] * Calendar/Mail: fix edit action meeting-requests to
 NOT set content-disposition: attachment, as this seems to stop automatic
 processing in Exchange

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

diff --git a/phpgwapi/inc/class.egw_mailer.inc.php b/phpgwapi/inc/class.egw_mailer.inc.php
index c57bb91556..6c51697e90 100644
--- a/phpgwapi/inc/class.egw_mailer.inc.php
+++ b/phpgwapi/inc/class.egw_mailer.inc.php
@@ -338,7 +338,6 @@ class egw_mailer extends Horde_Mime_Mail
 			$part->setContentTypeParameter($matches[2], $matches[3]);
 		}
 		$part->setContents($resource);
-		if ($name || !is_resource($data)) $part->setName($name ? $name : egw_vfs::basename($data));
 
 		// store "text/calendar" as _htmlBody, to trigger "multipart/alternative"
 		if (stripos($type,"text/calendar; method=") !== false)
@@ -346,6 +345,9 @@ class egw_mailer extends Horde_Mime_Mail
 			$this->_htmlBody = $part;
 			return;
 		}
+		// setting name, also sets content-disposition attachment (!), therefore we have to do it after "text/calendar; method=" handling
+		if ($name || !is_resource($data)) $part->setName($name ? $name : egw_vfs::basename($data));
+
 		// this should not be necessary, because binary data get detected by mime-type,
 		// but at least Cyrus complains about NUL characters
 		$part->setTransferEncoding('base64', array('send' => true));

From 05ea41493dfe33dead9a7a43eb6114e025dfd0fb Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 5 Oct 2015 15:25:10 +0000
Subject: [PATCH 073/130] Fix missing option check to work with options sent as
 an in-order array (label,value), fixes some custom fields not being properly
 set.

---
 etemplate/js/et2_widget_selectbox.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js
index fac1e83c0b..bc313e4a44 100644
--- a/etemplate/js/et2_widget_selectbox.js
+++ b/etemplate/js/et2_widget_selectbox.js
@@ -490,7 +490,9 @@ var et2_selectbox = et2_inputWidget.extend(
 		{
 			if(_value && jQuery("option[value='"+_value+"']", this.input).prop("selected", true).length == 0)
 			{
-				if(this.options.select_options[_value])
+				if(this.options.select_options[_value] ||
+					this.options.select_options.filter && 
+					this.options.select_options.filter(function(value) {return value == _value;}))
 				{
 					// Options not set yet? Do that now, which will try again.
 					return this.set_select_options(this.options.select_options);

From 060cf6073aaef3270c98810a7e65a29b1e51cb73 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 5 Oct 2015 15:45:44 +0000
Subject: [PATCH 074/130] Fix links to accounts (home-accounts) would not open
 properly when you click on them

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

diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index a4ce27ac6b..c015c64d36 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -143,7 +143,7 @@ class egw_link extends solink
 			'icon' => 'addressbook/accounts',
 			'query' => 'accounts::link_query',
 			'title' => 'common::grab_owner_name',
-			'view' => array('menuaction'=>'addressbook.addressbook_ui.view'),
+			'view' => array('menuaction'=>'addressbook.addressbook_ui.view','ajax'=>'true'),
 			'view_id' => 'account_id'
 		),
 		'home' => array(

From 86a1e4fbfa539b391966cfa1571b93d89db118b7 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 5 Oct 2015 15:50:30 +0000
Subject: [PATCH 075/130] Fix invalid options showing in link-entry custom
 field list by querying for the actually needed capabilities, and explictly
 add filemanager, which does not support them but gets special handling.

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

diff --git a/etemplate/inc/class.etemplate_widget_customfields.inc.php b/etemplate/inc/class.etemplate_widget_customfields.inc.php
index 4a42bb885b..4f5c118fc9 100644
--- a/etemplate/inc/class.etemplate_widget_customfields.inc.php
+++ b/etemplate/inc/class.etemplate_widget_customfields.inc.php
@@ -188,7 +188,10 @@ class etemplate_widget_customfields extends etemplate_widget_transformer
 					$sel_options[$lname] = lang($label);
 					$fields_with_vals[]=$lname;
 				}
-				$link_types = egw_link::app_list('query');
+				$link_types = array_intersect_key(egw_link::app_list('query'),egw_link::app_list('title'));
+				// Explicitly add in filemanager, which does not support query or title
+				$link_types['filemanager'] = lang('filemanager');
+
 				ksort($link_types);
 				foreach($link_types as $lname => $label)
 				{

From a6837b6a405ca596555b9f18ad36ae7951676fa4 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 5 Oct 2015 16:01:39 +0000
Subject: [PATCH 076/130] WIP EGroupware tutorial: -Add popup tutorials player
 -List tutorials in sidebox with their titles and thumbnails only

---
 etemplate/templates/default/egw_tutorial.xet | 10 +--
 home/inc/class.home_tutorial_ui.inc.php      | 72 ++++++++++++++++++++
 home/templates/default/tutorial.xet          | 13 ++++
 phpgwapi/js/jsapi/app_base.js                | 45 ++++++------
 4 files changed, 112 insertions(+), 28 deletions(-)
 create mode 100644 home/inc/class.home_tutorial_ui.inc.php
 create mode 100644 home/templates/default/tutorial.xet

diff --git a/etemplate/templates/default/egw_tutorial.xet b/etemplate/templates/default/egw_tutorial.xet
index 71d38a593c..e6fc177a01 100644
--- a/etemplate/templates/default/egw_tutorial.xet
+++ b/etemplate/templates/default/egw_tutorial.xet
@@ -8,11 +8,11 @@
 				<column/>
 			</columns>
 			<rows>
-				<row>
-					<vbox>
-						<description value = "$row_cont[title]" onclick="$row_cont[onclick]"/>
-						<iframe value="$row_cont[src]" width="99%" seamless="true" fullscreen="true"/>
-					</vbox>
+				<row >
+					<hbox onclick="$row_cont[onclick]">
+						<image src="$row_cont[thumbnail]" height="70px"/>
+						<description value = "$row_cont[title]" class="et2_ellipsis"/>
+					</hbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/home/inc/class.home_tutorial_ui.inc.php b/home/inc/class.home_tutorial_ui.inc.php
new file mode 100644
index 0000000000..a93ffb9cb4
--- /dev/null
+++ b/home/inc/class.home_tutorial_ui.inc.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * EGroupware - Tutorial
+ *
+ * @link http://www.egroupware.org
+ * @package home
+ * @author Hadi Nategh [hn@stylite.de]
+ * @copyright (c) 2015 by Stylite AG <info-AT-stylite.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id:$
+ */
+	
+class home_tutorial_ui {
+	
+	/**
+	 * Methods callable via menuaction
+	 *
+	 * @var array
+	 */
+	public $public_functions = array(
+		'popup' => true
+	);
+	
+	/**
+	 * Popup window to display youtube video
+	 * @param type $content
+	 */
+	function popup ($content)
+	{
+		//Allow youtube frame to pass the CSP check
+		egw_framework::csp_frame_src_attrs(array('www.youtube.com'));
+		
+		$tmpl = new etemplate_new('home.tutorial');
+		
+		// Get tutorial object id
+		$tuid_indx = explode('-',$_GET['tuid']);
+		
+		// read tutorials json file to fetch data
+		$tutorials = json_decode(self::getJsonData(), true);
+		
+		$content = $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]];
+				
+		$tmpl->exec('home.home_tutorial_ui.popup', $content,array(),array(),array(),array(),2);
+	}
+	
+	/**
+	 * Ajax function to get videos links as json
+	 */
+	function ajax_data()
+	{
+		$response = egw_json_response::get();
+		$response->data(json_decode(self::getJsonData()));
+	}
+	
+	/**
+	 * Function to fetch data from tutorials.json file
+	 * @return string returns json string
+	 *
+	 * @TODO: implement tree level caching
+	 */
+	static function getJsonData()
+	{
+		if (!($json = egw_cache::getCache(egw_cache::TREE, 'home', 'egw_tutorial_json')))
+		{
+			$json = file_get_contents('http://www.egroupware.de/videos/tutorials.json');
+			// Cache the json object for one month
+			egw_cache::addCache(egw_cache::TREE, 'home', 'egw_tutorial_json', $json, 3600 * 720);
+		}
+		
+		return $json;
+	}
+}	
\ No newline at end of file
diff --git a/home/templates/default/tutorial.xet b/home/templates/default/tutorial.xet
new file mode 100644
index 0000000000..6d2e3c04ae
--- /dev/null
+++ b/home/templates/default/tutorial.xet
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
+<overlay>
+	<template id="home.tutorial" template="" lang="" group="0" version="15.1">
+		<hbox height="87%">
+			<iframe id="src" height="100%" width="100%" seamless="true" fullscreen="true"/>
+		</hbox>
+		<hbox class="dialogFooterToolbar">
+			<button align="left" statustext="Close this window" label="Close" id="button[close]" onclick="window.close()" image="close" background_image="1"/>
+		</hbox>				
+	</template>
+</overlay>
diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index 637e5eca84..6885bf6704 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -961,26 +961,18 @@ var AppJS = Class.extend(
 	
 	/**
 	 * Get json data for videos from the given url
-	 * @param {string} _url url of tutorials json file
 	 * 
 	 * @return {Promise, object} return Promise, json object as resolved result and error message in case of failure
 	 */
-	egwTutorialGetData: function(_url){
-		var url = _url;
+	egwTutorialGetData: function(){
+		var self = this;
 		return new Promise (function(_resolve, _reject)
 		{
 			var resolve = _resolve;
 			var reject = _reject;
-			jQuery.ajax({
-				method:'GET',
-				url: url,
-				success: function (_data) {
+			self.egw.json('home.home_tutorial_ui.ajax_data', [self.egw.app_name()], function(_data){
 					resolve(_data);
-				},
-				fail: function (_err) {
-					reject(_err);
-				}
-			});
+			}).sendRequest();
 		});
 	},
 	
@@ -993,7 +985,7 @@ var AppJS = Class.extend(
 	 *		{
 	 *			[app name]:{
 	 *				[language tag]:[
-	 *					{src:"",title:"",top:""}		
+	 *					{src:"",thumbnail:"",title:"",top:""}		
 	 *				]
 	 *			}
 	 *		}
@@ -1005,12 +997,12 @@ var AppJS = Class.extend(
 	 *		{
 	 *			"mail":{
 	 *				"en":[
-	 *					{src:"https://www.youtube.com/embed/mCDJndpjO40", "title":"PGP Encryption"},
-	 *					{src:"https://www.youtube.com/embed/mCDJndpjO", "title":"Subscription", top:true},
+	 *					{src:"https://www.youtube.com/embed/mCDJndpjO40", thumbnail:"http://img.youtube.com/vi/mCDJndpjO40/1.jpg", "title":"PGP Encryption"},
+	 *					{src:"https://www.youtube.com/embed/mCDJndpjO", thumbnail:"http://img.youtube.com/vi/mCDJndpjO/1.jpg", "title":"Subscription", top:true},
 	 *				],
 	 *				"de":[
-	 *					{src:"https://www.youtube.com/embed/m40", "title":"PGP Verschlüsselung"},
-	 *					{src:"https://www.youtube.com/embed/mpjO", "title":"Ordner Abonnieren", top:true},
+	 *					{src:"https://www.youtube.com/embed/m40", thumbnail:"http://img.youtube.com/vi/m40/1.jpg", "title":"PGP Verschlüsselung"},
+	 *					{src:"https://www.youtube.com/embed/mpjO", thumbnail:"http://img.youtube.com/vi/mpjO/1.jpg", "title":"Ordner Abonnieren", top:true},
 	 *				]
 	 *			}
 	 *		}
@@ -1025,7 +1017,7 @@ var AppJS = Class.extend(
 		var etemplate = new etemplate2 (div, false);
 		var template = egw.webserverUrl+'/etemplate/templates/default/egw_tutorial.xet';
 		
-		this.egwTutorialGetData(egw.webserverUrl+'/tutorials.json').then(function(_data){
+		this.egwTutorialGetData().then(function(_data){
 			var lang = egw.preference('lang');
 			var content = {content:{list:[]}};
 			if (_data && _data[egw.app_name()])
@@ -1034,9 +1026,10 @@ var AppJS = Class.extend(
 				if (typeof _data[egw.app_name()][lang] !='undefined' 
 					&& _data[egw.app_name()][lang].length > 0)
 				{
-					for (var i=0;i<=_data[egw.app_name()][lang];i++)
+					for (var i=0;i < _data[egw.app_name()][lang].length;i++)
 					{
-						_data[egw.app_name()][lang][i]['onclick'] = 'egw.open()';
+						var tuid = egw.app_name() + '-' +lang + '-' + i;
+						_data[egw.app_name()][lang][i]['onclick'] = 'app.'+egw.app_name()+'.egwTutorialPopup("'+tuid+'")';
 					}
 					content.content.list = _data[egw.app_name()][lang];
 					// Get the video with top property into the top of the list
@@ -1056,13 +1049,19 @@ var AppJS = Class.extend(
 			}	
 		},
 		function(_err){
-			consloe.log(_err);
+			console.log(_err);
 		});
 	},
 	
-	egwTutorialPopup: function ()
+	/**
+	 * Open popup to show given tutorial id
+	 * @param {string} _tuid tutorial object id
+	 *	- tuid: appname-lang-index
+	 */
+	egwTutorialPopup: function (_tuid)
 	{
-		
+		var url = egw.link('/index.php', 'menuaction=home.home_tutorial_ui.popup&tuid='+_tuid);
+		egw.open_link(url,'_blank','500x400');
 	},
 	
 	/**

From b2c78d5b6f452d4bca9a2e1796a320b45dd9a2d7 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 5 Oct 2015 18:27:19 +0000
Subject: [PATCH 077/130] Apply end date to list view too.  Only makes a
 difference when selected range is used, but now it is pre-set.

---
 calendar/js/app.js | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index fffe9213d1..7336701eb6 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -440,6 +440,15 @@ app.classes.calendar = AppJS.extend(
 			.on('wheel.calendar','.et2_container .calendar_calTimeGrid, .et2_container .calendar_plannerWidget',
 				function(e)
 				{
+					var at_bottom = true;
+					var at_top = true;
+					$j(this).children().each(function() {
+						at_bottom = at_bottom && this.scrollTop === (this.scrollHeight - this.offsetHeight)
+					}).each(function() {
+						at_top = at_top && this.scrollTop === 0;
+					});
+					if(!at_bottom && !at_top) return;
+					
 					e.preventDefault();
 					var direction = e.originalEvent.deltaY > 0 ? 1 : -1;
 					var delta = 1;
@@ -1609,6 +1618,11 @@ app.classes.calendar = AppJS.extend(
 			if(state.state.view === 'listview')
 			{
 				state.state.startdate = state.state.date;
+
+				if(state.state.end_date)
+				{
+					state.state.enddate = state.state.end_date;
+				}
 				state.state.col_filter = {participant: state.state.owner};
 
 				// Pass status filter in as status filter, avoids conflicts with nm filter
@@ -2322,6 +2336,12 @@ app.classes.calendar = AppJS.extend(
 						state.planner_days = 0;
 						state.last = false;
 					}
+					else if (app.calendar.state.view == 'listview')
+					{
+						var d = app.calendar.View.end_date.call(this,state);
+						d = new Date(d.getFullYear(),d.getUTCMonth() + 1, 0);
+						state.end_date = d;
+					}
 					app.calendar.update_state(state);
 				},
 				// Mark holidays
@@ -2371,11 +2391,17 @@ app.classes.calendar = AppJS.extend(
 					{
 						app.calendar.update_state({view: 'week', date: date.getValue(), days: days});
 					}
-					else if (app.calendar.state.view == 'planner')
+					else if (view == 'planner')
 					{
 						// Clicked a week, show just a week
 						app.calendar.update_state({planner_days: 7});
 					}
+					else if (view == 'listview')
+					{
+						app.calendar.update_state({
+							end_date: app.classes.calendar.views.week.end_date({date:date.getValue()})
+						});
+					}
 				});
 		}
 	},

From 047105fb41d9fb3a0f7455fa116871aefeb97c5d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 5 Oct 2015 18:58:55 +0000
Subject: [PATCH 078/130] allow to read db-config from environment, by using
 "@name" to reference to name from environment

---
 phpgwapi/inc/class.egw_db.inc.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 2004481d1c..977b71669b 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -347,6 +347,11 @@ class egw_db
 		{
 			$this->Type = $GLOBALS['egw_info']['server']['db_type'];
 		}
+		foreach(array('Database', 'Host', 'Port', 'User', 'Password', 'Type') as $var)
+		{
+			$val = (string)$this->$var;
+			if ($val[0] === '@') $this->$var = getenv(substr($val, 1));
+		}
 		// on connection failure re-try with an other host
 		// remembering in session which host we used last time
 		$use_host_from_session = true;
@@ -371,6 +376,10 @@ class egw_db
 				$use_host_from_session = false;	// re-try with next host from list
 			}
 		}
+		if (!isset($e))
+		{
+			die('No DB Host set!');
+		}
 		throw $e;
 	}
 
@@ -451,7 +460,7 @@ class egw_db
 				case 'pgsql':
 					$type = 'postgres'; // name in ADOdb
 					// create our own pgsql connection-string, to allow unix domain soccets if !$Host
-					$Host = "dbname=$this->Database".($this->Host ? " host=$this->Host".($this->Port ? " port=$this->Port" : '') : '').
+					$Host = "dbname=$this->Database".($Host ? " host=$Host".($this->Port ? " port=$this->Port" : '') : '').
 						" user=$this->User".($this->Password ? " password='".addslashes($this->Password)."'" : '');
 					$User = $Password = $Database = '';	// to indicate $Host is a connection-string
 					break;
@@ -1670,6 +1679,7 @@ class egw_db
 				$column_type = is_array($column_definitions) ? @$column_definitions[$col]['type'] : False;
 				$not_null = is_array($column_definitions) && isset($column_definitions[$col]['nullable']) ? !$column_definitions[$col]['nullable'] : false;
 
+				$maxlength = null;
 				if ($truncate_varchar)
 				{
 					$maxlength = in_array($column_definitions[$col]['type'], array('varchar','ascii')) ? $column_definitions[$col]['precision'] : null;

From 57b7b0d93b6aca51cb3f4f019115a561db3bf043 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 5 Oct 2015 19:27:52 +0000
Subject: [PATCH 079/130] Add explanation to super-user login

---
 filemanager/lang/egw_de.lang            | 1 +
 filemanager/lang/egw_en.lang            | 1 +
 filemanager/templates/default/admin.xet | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/filemanager/lang/egw_de.lang b/filemanager/lang/egw_de.lang
index 8aadde917d..73e5392801 100644
--- a/filemanager/lang/egw_de.lang
+++ b/filemanager/lang/egw_de.lang
@@ -237,6 +237,7 @@ show link "your home directory" in side box menu?	filemanager	de	Möchten Sie de
 show link "your home directory*" in side box menu?*	filemanager	de	Möchten Sie den Verknüpfung  "Ihr Home Verzeichnis" innerhalb des Seitenmenüs angezeigt bekommen?
 show link to filemanagers basedirectory (/) in side box menu?	filemanager	de	Zeige die Verknüpfung zum Basisverzeichnis (/) des Dateimanagers im Seitenmenü?
 size	filemanager	de	Größe
+some functionalities require superuser permissions, please login here as filemanager superuser - allowed users are defined in setup.	filemanager	de	Einige Funktionalitäten benötigen Superuser-Rechte, bitte loggen sie sich hier als Dateimanager Superuser ein - zulässige Benutzer werden im Setup festgelegt.
 sqlfs statistics	filemanager	de	sqlFS Statistik
 start search	filemanager	de	Suche starten
 startfolder	filemanager	de	Anfangsordner
diff --git a/filemanager/lang/egw_en.lang b/filemanager/lang/egw_en.lang
index df2a08da3f..9a84cd3950 100644
--- a/filemanager/lang/egw_en.lang
+++ b/filemanager/lang/egw_en.lang
@@ -237,6 +237,7 @@ show link "your home directory" in side box menu?	filemanager	en	Show link "Your
 show link "your home directory*" in side box menu?*	filemanager	en	Show link "Your home directory*" in side box menu?*
 show link to filemanagers basedirectory (/) in side box menu?	filemanager	en	Show link to File Manager's base directory (/) in side menu?
 size	filemanager	en	Size
+some functionalities require superuser permissions, please login here as filemanager superuser - allowed users are defined in setup.	filemanager	en	Some functionalities require superuser permissions, please login here as filemanager superuser - allowed users are defined in setup.
 sqlfs statistics	filemanager	en	sqlFS Statistics
 start search	filemanager	en	Start search
 startfolder	filemanager	en	Start folder
diff --git a/filemanager/templates/default/admin.xet b/filemanager/templates/default/admin.xet
index 253cacaf3c..c7808be2c6 100644
--- a/filemanager/templates/default/admin.xet
+++ b/filemanager/templates/default/admin.xet
@@ -74,6 +74,9 @@
 					<column/>
 				</columns>
 				<rows>
+					<row disabled="@is_root">
+						<description span="all" value="Some functionalities require superuser permissions, please login here as filemanager superuser - allowed users are defined in setup."/>
+					</row>
 					<row disabled="@is_root">
 						<description value="User"/>
 						<textbox id="user"/>

From d8487a750780af514f28ec73ee1555a389d33547 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 5 Oct 2015 20:02:11 +0000
Subject: [PATCH 080/130] Fix refresh & updates when working on personal
 categories

---
 admin/inc/class.admin_categories.inc.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/inc/class.admin_categories.inc.php b/admin/inc/class.admin_categories.inc.php
index 69a06f2a56..28f23caa62 100644
--- a/admin/inc/class.admin_categories.inc.php
+++ b/admin/inc/class.admin_categories.inc.php
@@ -177,7 +177,7 @@ class admin_categories
 					}
 					if ($button == 'save')
 					{
-						egw_framework::refresh_opener($msg, $refresh_app, $content['id'], $change_color ? 'edit' : 'update', 'admin');
+						egw_framework::refresh_opener($msg, $refresh_app, $content['id'], $change_color ? 'edit' : 'update', $this->appname);
 						egw_framework::window_close();
 					}
 					break;
@@ -187,8 +187,8 @@ class admin_categories
 					{
 						$cats->delete($content['id'],$delete_subs,!$delete_subs);
 						$msg = lang('Category deleted.');
-						// Refresh internally looks for template name, which starts with 'admin'
-						egw_framework::refresh_opener($msg, $refresh_app, $content['id'],'delete', 'admin');
+
+						egw_framework::refresh_opener($msg, $refresh_app, $content['id'],'delete', $this->appname);
 						egw_framework::window_close();
 						return;
 					}
@@ -199,8 +199,8 @@ class admin_categories
 					}
 					break;
 			}
-			// Refresh internally looks for template name, which starts with 'admin'
-			egw_framework::refresh_opener($msg, $refresh_app, $content['id'], $change_color ? 'edit' : 'update', 'admin');
+
+			egw_framework::refresh_opener($msg, $refresh_app, $content['id'], $change_color ? 'edit' : 'update', $this->appname);
 		}
 		$content['msg'] = $msg;
 		if(!$content['appname']) $content['appname'] = $appname;
@@ -529,7 +529,7 @@ class admin_categories
 				{
 					$msg .= lang('%1 category(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
 				}
-				egw_framework::refresh_opener($msg, 'admin');
+				egw_framework::refresh_opener($msg, $this->appname);
 				$msg = '';
 			}
 		}

From a384714a8d6c6e41c93a1eea4242f6d037f54c00 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 5 Oct 2015 23:45:51 +0000
Subject: [PATCH 081/130] Calendar W.I.P - Change layout to show the whole 24
 hour day with a scrollbar, not just work day - Fix some translation issues
 (thanks Ulle) by using calendar's egw for lang calls - Fix cache is discarded
 even when state doesn't change, which broke filtering (thanks Ulle)

---
 calendar/inc/class.calendar_ui.inc.php |   6 +-
 calendar/js/app.js                     |  34 +-
 calendar/js/et2_widget_daycol.js       |  77 +--
 calendar/js/et2_widget_planner.js      |  20 +-
 calendar/js/et2_widget_timegrid.js     | 162 +++--
 calendar/templates/default/app.css     |  31 +-
 calendar/templates/pixelegg/app.css    | 805 +------------------------
 calendar/templates/pixelegg/app.less   |  17 +-
 8 files changed, 210 insertions(+), 942 deletions(-)

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index ad6252875c..0b4b1ec94e 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -317,7 +317,11 @@ class calendar_ui
 					else	// change only the owners of the given type
 					{
 						$res_type = is_numeric($set_owners[0]) ? false : $set_owners[0][0];
-						$owners = explode(',',$states['owner'] ? $states['owner'] : $default);
+						$owners = $states['owner'] ? $states['owner'] : $default;
+						if(!is_array($owners))
+						{
+							$owners = explode(',',$owners);
+						}
 						foreach($owners as $key => $owner)
 						{
 							if (!$res_type && is_numeric($owner) || $res_type && $owner[0] == $res_type)
diff --git a/calendar/js/app.js b/calendar/js/app.js
index 7336701eb6..4a4a7fd30d 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -1304,19 +1304,20 @@ app.classes.calendar = AppJS.extend(
 		{
 			for(var s in _set)
 			{
-				if(cachable_changes.indexOf(s) === -1)
-				{
-					// Expire daywise cache
-					var daywise = egw.dataKnownUIDs(app.classes.calendar.DAYWISE_CACHE_ID);
-					for(var i = 0; i < daywise.length; i++)
-					{
-						egw.dataDeleteUID(app.classes.calendar.DAYWISE_CACHE_ID + '::' + daywise[i]);
-					}
-				}
 				if (new_state[s] !== _set[s])
 				{
 					changed.push(s + ': ' + new_state[s] + ' -> ' + _set[s]);
 					new_state[s] = _set[s];
+					
+					if(cachable_changes.indexOf(s) === -1)
+					{
+						// Expire daywise cache
+						var daywise = egw.dataKnownUIDs(app.classes.calendar.DAYWISE_CACHE_ID);
+						for(var i = 0; i < daywise.length; i++)
+						{
+							egw.dataDeleteUID(app.classes.calendar.DAYWISE_CACHE_ID + '::' + daywise[i]);
+						}
+					}
 				}
 			}
 		}
@@ -2599,7 +2600,7 @@ jQuery.extend(app.classes.calendar,{
 	views: {
 		day: app.classes.calendar.prototype.View.extend({
 			header: function(state) {
-				return egw.lang('Day view') + ': ' + app.calendar.View.header.call(this, state);
+				return app.calendar.egw.lang('Dayview') + ': ' + app.calendar.View.header.call(this, state);
 			},
 			etemplates: ['calendar.view','calendar.todo'],
 			start_date: function(state) {
@@ -2621,7 +2622,7 @@ jQuery.extend(app.classes.calendar,{
 		}),
 		day4: app.classes.calendar.prototype.View.extend({
 			header: function(state) {
-				return egw.lang('Four days view') + ': ' + app.calendar.View.header.call(this, state);
+				return app.calendar.egw.lang('Four days view') + ': ' + app.calendar.View.header.call(this, state);
 			},
 			end_date: function(state) {
 				var d = app.calendar.View.end_date.call(this,state);
@@ -2645,7 +2646,7 @@ jQuery.extend(app.classes.calendar,{
 		week: app.classes.calendar.prototype.View.extend({
 			header: function(state) {
 				var formatDate = new Date(state.first);
-				return egw.lang('Week view') + ': ' + egw.lang('Week') + ' ' +
+				return app.calendar.egw.lang('Weekview') + ': ' + app.calendar.egw.lang('Week') + ' ' +
 					app.calendar.date.week_number(state.first) + ': ' +
 					app.calendar.date.long_date(state.first, state.last)
 			},
@@ -2669,7 +2670,7 @@ jQuery.extend(app.classes.calendar,{
 		}),
 		weekN: app.classes.calendar.prototype.View.extend({
 			header: function(state) {
-				return egw.lang('Week') + ' ' +
+				return app.calendar.egw.lang('Week') + ' ' +
 					app.calendar.date.week_number(state.first) + ' - ' +
 					app.calendar.date.week_number(state.last) + ': ' +
 					app.calendar.date.long_date(state.first, state.last)
@@ -2694,7 +2695,7 @@ jQuery.extend(app.classes.calendar,{
 			{
 				var formatDate = new Date(state.date);
 				formatDate = new Date(formatDate.valueOf() + formatDate.getTimezoneOffset() * 60 * 1000);
-				return egw.lang('Month view') + ':' + egw.lang(date('F',formatDate)) + ' ' + date('Y',formatDate);
+				return app.calendar.egw.lang('Monthview') + ':' + app.calendar.egw.lang(date('F',formatDate)) + ' ' + date('Y',formatDate);
 			},
 			start_date: function(state) {
 				var d = app.calendar.View.start_date.call(this,state);
@@ -2732,7 +2733,8 @@ jQuery.extend(app.classes.calendar,{
 
 				var endDate = new Date(state.last);
 				endDate = new Date(endDate.valueOf() + endDate.getTimezoneOffset() * 60 * 1000);
-				return egw.lang('Planner view') + ': ' + date(egw.preference('dateformat'),startDate) +
+				var title = state.sortby == 'user' ? 'planner by user' : state.sortby=='month' ? 'yearly planner' : 'planner by category';
+				return app.calendar.egw.lang(title) + ': ' + date(egw.preference('dateformat'),startDate) +
 					(startDate == endDate ? '' : ' - ' + date(egw.preference('dateformat'),endDate));
 			},
 			etemplates: ['calendar.planner'],
@@ -2820,7 +2822,7 @@ jQuery.extend(app.classes.calendar,{
 		}),
 
 		listview: app.classes.calendar.prototype.View.extend({
-			header: function() {return egw.lang('List view');},
+			header: function() {return app.calendar.egw.lang('Listview');},
 			etemplates: ['calendar.list']
 		})
 	}}
diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js
index 290c321ec7..57a23144a1 100644
--- a/calendar/js/et2_widget_daycol.js
+++ b/calendar/js/et2_widget_daycol.js
@@ -65,8 +65,11 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 		this.div = $j(document.createElement("div"))
 			.addClass("calendar_calDayCol")
 			.css('width',this.options.width);
-		this.title = $j(document.createElement('div'))
+		this.header = $j(document.createElement('div'))
+			.addClass("calendar_calDayColHeader")
 			.appendTo(this.div);
+		this.title = $j(document.createElement('div'))
+			.appendTo(this.header);
 
 		this.setDOMNode(this.div[0]);
 
@@ -80,7 +83,6 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 			wd_start:	60*9,
 			wd_end:		60*17,
 			granularity:	30,
-			extraRows:	2,
 			rowsToDisplay:	10,
 			rowHeight:	20,
 			// Percentage; not yet available
@@ -105,8 +107,10 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 	destroy: function() {
 		this._super.apply(this, arguments);
 		this.div.off();
+		this.header.off().remove();
 		this.title.off();
 		this.div = null;
+		this.header = null;
 		this.title = null;
 		
 		// date_helper has no parent, so we must explicitly remove it
@@ -129,15 +133,16 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 			this.display_settings.wd_start = 60*this._parent.options.day_start;
 			this.display_settings.wd_end = 60*this._parent.options.day_end;
 			this.display_settings.granularity = this._parent.options.granularity;
-			this.display_settings.extraRows = this._parent.options.extra_rows;
+			this._parent.dayHeader.append(this.header);
 		}
 
-		this.display_settings.rowsToDisplay	= ((this.display_settings.wd_end - this.display_settings.wd_start)/this.display_settings.granularity)+2+2*this.display_settings.extraRows;
+		this.header.css('left', this.div.css('left'));
+		this.display_settings.rowsToDisplay	= ((this.display_settings.wd_end - this.display_settings.wd_start)/this.display_settings.granularity);
 		this.display_settings.rowHeight= (100/this.display_settings.rowsToDisplay).toFixed(1);
 		this.display_settings.titleHeight = (this.title.height()/this.div.height())*100;
 
 		// adding divs to click on for each row / time-span
-		for(var t =this.display_settings.wd_start,i = 1+this.display_settings.extraRows; t <= this.display_settings.wd_end; t += this.display_settings.granularity,++i)
+		for(var t = 0,i = 1; t < 1440; t += this.display_settings.granularity,++i)
 		{
 			var linkData = {
 				'menuaction':'calendar.calendar_uiforms.edit',
@@ -150,7 +155,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 			var droppableDateTime = linkData['date'] + "T" + linkData['hour'] + linkData['minute'];
 			var droppableID='drop_'+droppableDateTime+'_O'+(this.options.owner<0?'group'+Math.abs(this.options.owner):this.options.owner);
 
-			var hour = jQuery('<div id="' + droppableID + '" style="height:'+ this.display_settings.rowHeight +'%; top: '+ (i*this.display_settings.rowHeight).toFixed(1) +'%;" class="calendar_calAddEvent">')
+			var hour = jQuery('<div id="' + droppableID + '" style="height:'+ this._parent.rowHeight+'px; " class="calendar_calAddEvent">')
 				.attr('data-date',linkData.date)
 				.attr('data-hour',linkData.hour)
 				.attr('data-minute',linkData.minute)
@@ -206,7 +211,8 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 		var date_string = this._parent._children.length === 1 ?
 			app.calendar.date.long_date(formatDate,false, false, true) :
 			jQuery.datepicker.formatDate('DD dd',formatDate);
-		this.title.text(date_string);
+		this.title.text(date_string)
+			.attr("data-date", new_date);
 
 		// Avoid redrawing if date is the same
 		if(new_date === this.options.date && !force_redraw)
@@ -221,8 +227,6 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 
 		this.options.date = new_date;
 
-		this.div.attr("data-date", this.options.date);
-
 		// Set holiday and today classes
 		this.day_class_holiday();
 
@@ -290,6 +294,15 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 		},this,this.getInstanceManager().execId,this.id);
 	},
 
+	set_left: function(left) {
+		this.div.css('left',left);
+		this.header.css('left',left);
+	},
+	set_width: function(width) {
+		this._super.apply(this, arguments);
+		this.header.width(width);
+	},
+
 	/**
 	 * Applies class for today, and any holidays for current day
 	 */
@@ -297,12 +310,13 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 		// Remove all classes
 		this.title.removeClass()
 			// Except this one...
-			.addClass("et2_clickable calendar_calDayColHeader et2_link");
+			.addClass("et2_clickable et2_link");
+		this.header.removeClass('calendar_calBirthday calendar_calHoliday');
 
 		// Set today class - note +1 when dealing with today, as months in JS are 0-11
 		var today = new Date();
 		
-		this.title.toggleClass("calendar_calToday", this.options.date === ''+today.getUTCFullYear()+
+		this.header.toggleClass("calendar_calToday", this.options.date === ''+today.getUTCFullYear()+
 			sprintf("%02d",today.getUTCMonth()+1)+
 			sprintf("%02d",today.getUTCDate())
 		);
@@ -317,7 +331,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 			{
 				if (typeof holidays[i]['birthyear'] !== 'undefined')
 				{
-					this.title.addClass('calendar_calBirthday');
+					this.header.addClass('calendar_calBirthday');
 
 					//If the birthdays are already displayed as event, don't
 					//show them in the caption
@@ -328,8 +342,8 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 				}
 				else
 				{
-					this.title.addClass('calendar_calHoliday');
-					this.title.attr('data-holiday', holidays[i]['name']);
+					this.header.addClass('calendar_calHoliday');
+					this.header.attr('data-holiday', holidays[i]['name']);
 
 					//If the birthdays are already displayed as event, don't
 					//show them in the caption
@@ -340,7 +354,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 				}
 			}
 		}
-		this.title.attr('title', holiday_list.join(','));
+		this.header.attr('title', holiday_list.join(','));
 	},
 
 	/**
@@ -509,8 +523,10 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 				var height = 0;
 				if(columns[c][i].options.value.whole_day_on_top)
 				{
-					top = this.display_settings.titleHeight + this.display_settings.rowHeight*whole_day_counter++;
-					height = this.display_settings.rowHeight;
+					columns[c][i].div
+						.appendTo(this.header)
+						.css('position', 'relative');
+					continue;
 				}
 				else
 				{
@@ -539,7 +555,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 	/**
 	 * Calculates the vertical position based on the time
 	 *
-	 * workday start- and end-time, is taken into account, as well as timeGrids px_m - minutes per pixel param
+	 * This calculation is a percentage from 00:00 to 23:59
 	 *
 	 * @param {int} time in minutes from midnight
 	 * @param {int} [row_offset=0] Add extra spacing for additional rows
@@ -553,21 +569,9 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 			row_offset = 0;
 		}
 		
-		// time before workday => condensed in the first $this->extraRows rows
-		if (this.display_settings.wd_start > 0 && time < this.display_settings.wd_start)
-		{
-			pos = this.display_settings.titleHeight + (row_offset + (time / this.display_settings.wd_start )) * this.display_settings.rowHeight;
-		}
-		// time after workday => condensed in the last row
-		else if (this.display_settings.wd_end < 24*60 && time > this.display_settings.wd_end+1*this.display_settings.granularity)
-		{
-			pos = 100 - (row_offset * this.display_settings.rowHeight * (1 - (time - this.display_settings.wd_end) / (24*60 - this.display_settings.wd_end)));
-		}
-		// time during the workday => 2. row on (= + granularity)
-		else
-		{
-			pos = this.display_settings.rowHeight * (1+this.display_settings.extraRows+(time-this.display_settings.wd_start)/this.display_settings.granularity);
-		}
+		// 24h
+		pos = ((time / 60) / 24) * 100
+		
 		pos = pos.toFixed(1)
 
 		return pos;
@@ -600,9 +604,10 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 	 * @param {Event} _ev
 	 * @returns {boolean}
 	 */
-	click: function(_ev) {
-		
-		if($j(_ev.target).hasClass('calendar_calDayColHeader'))
+	click: function(_ev)
+	{
+		// Click on the title
+		if(this.title.is(_ev.target))
 		{
 			this._parent.set_start_date(this.date);
 			this._parent.set_end_date(this.date);
diff --git a/calendar/js/et2_widget_planner.js b/calendar/js/et2_widget_planner.js
index e281620539..9f2d472f3d 100644
--- a/calendar/js/et2_widget_planner.js
+++ b/calendar/js/et2_widget_planner.js
@@ -418,7 +418,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 				for(var i = 0; i < 12; i++)
 				{
 					// Not using UTC because we corrected for timezone offset
-					labels.push({id: d.getFullYear() +'-'+d.getMonth(), label:egw.lang(date('F',d))+' '+d.getFullYear()});
+					labels.push({id: d.getFullYear() +'-'+d.getMonth(), label:app.calendar.egw.lang(date('F',d))+' '+d.getFullYear()});
 					d.setMonth(d.getMonth()+1);
 				}
 				return labels;
@@ -461,6 +461,10 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 						if(labels[i].id == key)
 						{
 							label_index = i;
+							if(typeof rows[label_index] === 'undefined')
+							{
+								rows[label_index] = [];
+							}
 							break;
 						}
 					}
@@ -725,8 +729,8 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 		var end = new Date(this.options.end_date);
 		end = new Date(end.valueOf() + end.getTimezoneOffset() * 60 * 1000);
 
-		var title = egw.lang(date('F',start))+' '+date('Y',start)+' - '+
-			egw.lang(date('F',end))+' '+date('Y',end);
+		var title = app.calendar.egw.lang(date('F',start))+' '+date('Y',start)+' - '+
+			app.calendar.egw.lang(date('F',end))+' '+date('Y',end);
 
 		// calculate date for navigation links
 		var time = new Date(start);
@@ -790,7 +794,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 			}
 			if (days_in_month > 5)
 			{
-				var title = egw.lang(date('F',new Date(t.valueOf() + t.getTimezoneOffset() * 60 * 1000)))
+				var title = app.calendar.egw.lang(date('F',new Date(t.valueOf() + t.getTimezoneOffset() * 60 * 1000)))
 			}
 			if (days_in_month > 10)
 			{
@@ -857,7 +861,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 		var t = new Date(start);
 		for(var left = 0,i = 0; i < days; t.setUTCDate(t.getUTCDate() + 7),left += week_width,i += 7)
 		{
-			var title = egw.lang('Week')+' '+app.calendar.date.week_number(t);
+			var title = app.calendar.egw.lang('Week')+' '+app.calendar.date.week_number(t);
 
 			state = new Date(t.valueOf() - start.getTimezoneOffset() * 60 * 1000).toJSON();
 			if (days  <= 7)
@@ -907,15 +911,15 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
 
 			if (days <= 3)
 			{
-				title = egw.lang(date('l',t))+', '+date('j',t)+'. '+egw.lang(date('F',t));
+				title = app.calendar.egw.lang(date('l',t))+', '+date('j',t)+'. '+app.calendar.egw.lang(date('F',t));
 			}
 			else if (days <= 7)
 			{
-				title = egw.lang(date('l',t))+' '+date('j',t);
+				title = app.calendar.egw.lang(date('l',t))+' '+date('j',t);
 			}
 			else
 			{
-				title = egw.lang(date('D',t)).substr(0,2)+'<br />'+date('j',t);
+				title = app.calendar.egw.lang(date('D',t)).substr(0,2)+'<br />'+date('j',t);
 			}
 			state = new Date(t.valueOf() - start.getTimezoneOffset() * 60 * 1000).toJSON();
 			if (days < 5)
diff --git a/calendar/js/et2_widget_timegrid.js b/calendar/js/et2_widget_timegrid.js
index af078aa05d..5706aa959b 100644
--- a/calendar/js/et2_widget_timegrid.js
+++ b/calendar/js/et2_widget_timegrid.js
@@ -65,12 +65,6 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 			default: parseInt(egw.preference('interval','calendar')) || 30,
 			description: "How many minutes per row"
 		},
-		extra_rows: {
-			name: "Extra rows",
-			type: "integer",
-			default: 2,
-			description: "Extra rows above and below the workday"
-		},
 		owner: {
 			name: "Owner",
 			type: "any", // Integer, or array of integers
@@ -107,15 +101,22 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 			.addClass("calendar_calTimeGrid")
 			.addClass("calendar_TimeGridNoLabel");
 
-		// Contains times / rows
+		// Headers
 		this.gridHeader = $j(document.createElement("div"))
 			.addClass("calendar_calGridHeader et2_link")
 			.appendTo(this.div);
+		this.dayHeader = $j(document.createElement("div"))
+			.appendTo(this.gridHeader);
 		
+		// Contains times / rows
+		this.scrolling = $j(document.createElement('div'))
+			.addClass("calendar_calTimeGridScroll")
+			.appendTo(this.div);
+
 		// Contains days / columns
 		this.days = $j(document.createElement("div"))
 			.addClass("calendar_calDayCols")
-			.appendTo(this.div);
+			.appendTo(this.scrolling);
 
 		// Used for its date calculations
 		this.date_helper = et2_createWidget('date',{},null);
@@ -157,7 +158,9 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 		this.div.off();
 		this.div = null;
 		this.gridHeader = null;
+		this.dayHeader = null;
 		this.days = null;
+		this.scrolling = null;
 		this._labelContainer = null;
 
 		// date_helper has no parent, so we must explicitly remove it
@@ -173,6 +176,10 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 
 	doLoadingFinished: function() {
 		this._super.apply(this, arguments);
+		
+		// Need to get the correct internal sizing
+		this.resize();
+
 		this._drawGrid();
 
 		// Actions may be set on a parent, so we need to explicitly get in here
@@ -198,7 +205,8 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 			$j(this).resizable
 			({
 				distance: 10,
-				grid: [10000,10],
+				// Grid matching preference
+				grid: [10000,timegrid.rowHeight],
 				autoHide: false,
 				handles: 's,se',
 				containment:'parent',
@@ -252,6 +260,7 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 					{
 						event_widget._parent.position_event(event_widget);
 					}
+					timegrid.div.children('.drop-hover').removeClass('.drop-hover');
 				},
 
 				/**
@@ -263,7 +272,11 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 				resize:function(event, ui)
 				{
 					// Add 5px to make sure it doesn't land right on the edge of a div
-					timegrid._drag_helper(this,ui.element[0],ui.helper.outerHeight()+5);
+					var drop = timegrid._drag_helper(this,ui.element[0],ui.helper.outerHeight()+5);
+					if(drop && !drop.is(':visible'))
+					{
+						drop.get(0).scrollIntoView(false);
+					}
 				}	 
 			});
 		});
@@ -294,6 +307,17 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 		if (typeof element.dropEnd != 'undefined' && element.dropEnd.length)
 		{
 			element.dropEnd.addClass("drop-hover");
+
+			// Make sure the target is visible in the scrollable day
+			var scrollto = element.dropEnd.next() ? element.dropEnd.next() : element.dropEnd;
+			if(this.scrolling.height() + this.scrolling.scrollTop() < scrollto[0].offsetTop+scrollto.height() )
+			{
+				scrollto.get(0).scrollIntoView(false);
+			}
+			else if(element.dropEnd[0].offsetTop < this.scrolling[0].scrollTop)
+			{
+				element.dropEnd.get(0).scrollIntoView(true);
+			}
 			var time = jQuery.datepicker.formatTime(
 				egw.preference("timeformat") == 12 ? "h:mmtt" : "HH:mm",
 				{
@@ -463,7 +487,6 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 		this._drawTimes();
 
 		// Draw in the vertical - the days
-		this.div.append(this.days);
 		this.invalidate();
 	},
 
@@ -478,24 +501,28 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 		var wd_end = 60*this.options.day_end;
 		var granularity = this.options.granularity;
 		var totalDisplayMinutes	= wd_end - wd_start;
-		var rowsToDisplay	= (totalDisplayMinutes/granularity)+2+2*this.options.extra_rows;
+		var rowsToDisplay	= (totalDisplayMinutes/granularity);
+		// Percent
 		var rowHeight = (100/rowsToDisplay).toFixed(1);
+		// Pixels
 		this.rowHeight = this.div.height() / rowsToDisplay;
 
-		// ensure a minimum height of each row
-		if (this.options.height < (rowsToDisplay+1) * 12)
-		{
-			this.options.height = (rowsToDisplay+1) * 12;
-		}
-
 		this.gridHeader
-			.css('height', rowHeight+'%')
-			.text(this.options.label)
+			.empty()
+			.css('height', this.rowHeight+'px')
 			.attr('data-date', this.options.start_date)
 			.attr('data-owner', this.options.owner)
+			.append(this.options.label)
 			.append(this.owner.getDOMNode())
+			.append(this.dayHeader)
 			.appendTo(this.div);
 
+		this.scrolling
+			.css('top', this.rowHeight+'px')
+			.css('height', (this.options.height - this.rowHeight)+'px')
+			.appendTo(this.div)
+			.empty();
+
 		// the hour rows
 		var show = {
 			5  : [0,15,30,45],
@@ -504,9 +531,10 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 			45 : [0,15,30,45]
 		};
 		var html = '';
-		for(var t = wd_start,i = 1+this.options.extra_rows; t <= wd_end; t += granularity,++i)
+		this._top_time = 0
+		for(var t = 0,i = 0; t < 1440; t += granularity,++i)
 		{
-			html += '<div class="calendar_calTimeRow" style="height: '+rowHeight+'%; top:'+ (i*rowHeight).toFixed(1) +'%;">';
+			html += '<div class="calendar_calTimeRow" style="height: '+this.rowHeight+'px;">';
 			// show time for full hours, always for 45min interval and at least on every 3 row
 			var time = jQuery.datepicker.formatTime(
 					egw.preference("timeformat") == 12 ? "h:mmtt" : "HH:mm",
@@ -518,11 +546,22 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 					},
 					{"ampm": (egw.preference("timeformat") == "12")}
 				);
+			if(t <= wd_start && t + granularity > wd_start)
+			{
+				this._top_time = this.rowHeight * (i+1+(wd_start - (t+granularity))/granularity)
+			}
 
 			var time_label = (typeof show[granularity] === 'undefined' ? t % 60 === 0 : show[granularity].indexOf(t % 60) !== -1) ? time : '';
 			html += '<div class="calendar_calTimeRowTime et2_clickable" data-time="'+time.trim()+'" data-hour="'+Math.floor(t/60)+'" data-minute="'+(t%60)+'">'+time_label+"</div></div>\n";
 		}
-		this.div.append(html);
+
+		// Set heights in pixels for scrolling
+		this.scrolling
+			.append('<div class="calendar_calTimeLabels" style="height: ' +(this.rowHeight*i)+'px" >' + html + '</div>');
+		this.days.css('height', (this.rowHeight*i)+'px');
+
+		// Scroll to start of day
+		this.scrolling.scrollTop(this._top_time);
 	},
 
 	/**
@@ -531,6 +570,8 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 	 * widgets.  Existing widgets are recycled rather than discarded.
 	 */
 	_drawDays: function() {
+		this.scrolling.append(this.days);
+		
 		// If day list is still empty, recalculate it from start & end date
 		if(this.day_list.length === 0)
 		{
@@ -568,37 +609,22 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 		for(var i = 0; i < this.day_list.length; i++)
 		{
 			day = this.day_widgets[i];
-			// Set the date, and pass any data we have
-			/* Not needed due to registered callbacks (?)
-			if(typeof this.value[this.day_list[i]] === 'undefined')
-			{
-				var ids = (egw.dataGetUIDdata(app.classes.calendar._daywise_cache_id(this.day_list[i],this.options.owner))||{data:[]});
-				if(ids.data.length > 0)
-				{
-					this.value[this.day_list[i]] = [];
-				}
-				for(var j = 0; j < ids.data.length; j++)
-				{
-					if(egw.dataHasUID('calendar::'+ids.data[j]))
-					{
-						this.value[this.day_list[i]].push(egw.dataGetUIDdata('calendar::'+ids.data[j]).data);
-					}
-				}
-			}
-			*/
-
+			
+			// Position
+			day.set_left(((100/this.day_list.length).toFixed(2) * i) + '%');
+			
 			day.set_date(this.day_list[i], this.value[this.day_list[i]] || false);
 			day.set_owner(this.options.owner);
 			day.set_id(this.day_list[i]);
 			day.set_width((100/this.day_list.length).toFixed(2) + '%');
-
-			// Position
-			$j(day.getDOMNode()).css('left', ((100/this.day_list.length).toFixed(2) * i) + '%');
 		}
 
 		// Don't hold on to value any longer, use the data cache for best info
 		this.value = {};
 		
+		// Scroll to start of day
+		this.scrolling.scrollTop(this._top_time);
+		
 		// TODO: Figure out how to do this with detached nodes
 		/*
 		var nodes = this.day_col.getDetachedNodes();
@@ -1089,7 +1115,10 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 	set_label: function(label)
 	{
 		this.options.label = label;
-		this.gridHeader.text(label);
+		this.gridHeader.contents().filter(function() {
+			return (this.nodeType == 3);
+		}).remove();
+		this.gridHeader.append(label);
 
 		// If it's a short label (eg week number), don't give it an extra line
 		// but is empty, but give extra space for a single owner name
@@ -1203,7 +1232,7 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 		var result = true;
 		
 		// Is this click in the event stuff, or in the header?
-		if(this.days.has(_ev.target).length)
+		if($j(_ev.target).hasClass('.calendar_calEvent') || $j(_ev.target).parents('.calendar_calEvent').length)
 		{
 			// Event came from inside, maybe a calendar event
 			var event = this._get_event_info(_ev.originalEvent.target);
@@ -1228,6 +1257,18 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 		{
 			app.calendar.update_state(jQuery.extend({view: 'week'},_ev.target.dataset));
 		}
+		else if (this.dayHeader.has(_ev.target).length)
+		{
+			// Click on a day header - let day deal with it
+			// First child is a selectAccount
+			for(var i = 1; i < this._children.length; i++)
+			{
+				if(this._children[i].header && this._children[i].header.has(_ev.target).length)
+				{
+					return this._children[i].click(_ev);
+				}
+			}
+		}
 		else if (_ev.target.dataset.date)
 		{
 			// Default handler to open a new event at the selected time
@@ -1304,10 +1345,31 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 	},
 
 	// Resizable interface
-	resize: function (_height)
+	resize: function ()
 	{
-		this.options.height = _height;
-		this.div.css('height', this.options.height);
+		// We expect the timegrid to be in a table with 0 or more other timegrids,
+		// 1 per row.  We want each timegrid to be as large as possible, but space
+		// shared equally.  Height can't be set to a percentage on the rows, because
+		// that doesn't work.
+
+		// Find the table
+		var table = this.div.parentsUntil('table').parent();
+
+		// How many rows?
+		var rowCount = table.children('tr').length;
+
+		// Take the whole tab height
+		this.options.height = Math.floor(Math.min($j(this.getInstanceManager().DOMContainer).height(),$j(this.getInstanceManager().DOMContainer).parent().innerHeight()) / rowCount);
+		this.options.height = Math.floor((egw.getHiddenDimensions(this.getInstanceManager().DOMContainer).h ) / rowCount);
+		this.options.height -= 2*((this.div.outerWidth(true) - this.div.innerWidth()) + parseInt(this.div.parent().css('padding-top')));
+		
+		if(this.options.height+"px" != this.div.css('height'))
+		{
+			this.div.css('height', this.options.height);
+			
+			// Re-do time grid
+			this._drawGrid()
+		}
 	}
 });
 et2_register_widget(et2_calendar_timegrid, ["calendar-timegrid"]);
\ No newline at end of file
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index fdf7b2e2e2..8e38c4378a 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -136,12 +136,19 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
     -moz-user-select: none;
     -ms-user-select: none;
     user-select: none;
-	width: 99%;
+	overflow: hidden;
 /* set via inline style on runtime:
  *  height:
  */
 }
 
+.calendar_calTimeGrid .calendar_calTimeGridScroll {
+	position: absolute;
+	bottom: 0px;
+	width: 100%;
+	overflow-y: auto;
+	overflow-x: hidden;
+}
 .calendar_calTimeGrid.calendar_TimeGridNoLabel > .calendar_calDayCols {
 	top: 0em;
 }
@@ -150,10 +157,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 	top: 0em;
 }
 
-/* single row in the time-line, always used in conjunction with row_{on|off}, you dont need to set a bgcolor, but you can
+/* single row in the time-line you dont need to set a bgcolor, but you can
  */
 .calendar_calTimeRow {
-	position: absolute;
 	width: 100%;
 /* set via inline style on runtime:
  *  height:
@@ -178,8 +184,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
  */
 .calendar_calDayCols,.calendar_calDayCols12h,.calendar_calDayColsNoGrid{
 	position: absolute;
-	top: 2em;
-/*	bottom: 0px; does NOT work in IE, IE needs height: 100%! */
+	top: 0px;
+	/*	bottom: 0px; does NOT work in IE, IE needs height: 100%! */
 	height: 100%;
 	left: 45px;
 	right: 0px;
@@ -200,14 +206,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calDayCol{
 	position: absolute;
 	top: 0px;
-	height: 100%;
-/* set via inline style on runtime:
+	height: 100%;/* set via inline style on runtime:
  *  left:
  *  width:
  */
-	border-left: 1px solid silver;
-	
-	/* Nice transition when changing days in a week */
+	border-left: 1px solid silver;/* Nice transition when changing days in a week */
 	-webkit-transition: 0.1s ease-in-out;
 }
 /* Calendar Id #
@@ -217,7 +220,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 
 /* header for the dayCol
  */
-.calendar_calDayColHeader,.calendar_calGridHeader{
+.calendar_calDayColHeader,.calendar_calGridHeader,.calendar_calGridHeader > div {
 	position: absolute;
 	top: 0px;
 	left: 0px;
@@ -234,6 +237,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calDayColHeader {
 	z-index:30;
 }
+.calendar_calGridHeader > div {
+	left: 45px;
+	right: 15px;
+	width: initial;
+}
 .calendar_calDayColHeader img {
 	vertical-align: middle;
 }
@@ -395,7 +403,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 }
 
 .calendar_calAddEvent{
-	position: absolute;
 	width: 100%;
 	z-index: 10;
 }
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index c8733afa56..957f35e5f8 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1,3 +1,4 @@
+@import "../default/app.css";
 /**
  * EGroupware: CSS with less preprocessor
  *
@@ -11,794 +12,6 @@
  * @package calendar
  * @version $Id$
  */
-/* $Id: app.css 53642 2015-09-14 15:31:58Z nathangray $ */
-/*Media print classes*/
-@media print {
-  .th td,
-  .row_on td,
-  .row_off td {
-    border: none !important;
-  }
-  img.calendar_print_button {
-    display: none !important;
-  }
-  tr.calendar_print_cat {
-    border-bottom: 1px solid gray;
-  }
-}
-/**
- * Sidebox
- */
-#calendar-sidebox_owner {
-  width: 82%;
-}
-#calendar-sidebox_cat_id {
-  width: 86%;
-}
-#calendar-sidebox_buttons tbody {
-  width: 100%;
-}
-#calendar-sidebox_date td.ui-datepicker-week-col {
-  cursor: pointer;
-}
-#calendar-sidebox_date .calendar_calHoliday {
-  background: inherit;
-}
-#calendar-sidebox_date .calendar_calHoliday a {
-  background-color: #dac0c0;
-}
-#calendar-todo {
-  float: right;
-  width: 30%;
-}
-/* Header classes */
-tr.dialogHeader td,
-tr.dialogHeader2 td,
-tr.dialogHeader3 td,
-tr.dialogHeader4 td,
-tr.dialogOperators td,
-.dialogFooterToolbar {
-  padding: 5px 0 5px 0;
-  vertical-align: middle;
-}
-.calendar_inputFullWidth input {
-  width: 100%;
-}
-/******************************************************************
- * CSS settings for the day, week and month view (timeGridWidget) *
- ******************************************************************/
-/*
-Names used in the "graphic" are the css classes from this file.
-The function names in class uiviews have the leading cal removed and a trailing Widget added:
-e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget method of uiviews.
-
-+++ calendar_calTimeGrid +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+                #### calendar_calDayCols[12h|NoGrip] ###########################################################
-+                #... calendar_calDayCol ............................. ... calendar_calDayCol ..........................
-+                #.+- calendar_calDayColHeader ---------------------+. .+- calendar_calDayColHeader ------------------+.
-+                #.|                                       |. .|                                    |.
-+                #.+---------------------------------------+. .+------------------------------------+.
-+.calendar_calTimeRowTime.#.** calendar_calEventCol ***** ** calendar_calEventCol *****. .** calendar_calEventCol ***********************.
-+.              .#.*                  * *                  *. .*                                    *.
-+.              .#.*                  * *                  *. .*                                    *.
-+................#.*+- calendar_calEvent -----+* *                  *. .*                                    *.
-+.calendar_calTimeRowTime.#.*|                |* *                  *. .*+- calendar_calEvent[Private] --------------+*.
-+.              .#.*|                |* *+- calendar_calEvent -----+*. .*|                                  |*.
-+.              .#.*+----------------+* *|                |*. .*|                                  |*.
-+................#.*                  * *|                |*. .*|                                  |*.
-+.calendar_calTimeRowTime.#.*                  * *+----------------+*. .*|                                  |*.
-+.              .#.*                  * *                  *. .*+----------------------------------+*.
-
-*/
-/* custom ui-tooltip style for calendar
-*/
-.calendar_uitooltip {
-  padding: 0px;
-  position: absolute;
-  border: none;
-  max-height: 400px;
-  z-index: 9999;
-  max-width: 300px;
-  -webkit-box-shadow: 0 0 5px;
-  -moz-box-shadow: 0 0 5px;
-  box-shadow: 0 0 5px;
-}
-.calendar_size120b {
-  font-size: 120%;
-  font-weight: bold;
-}
-/* marks a day in the colum-header as today
- */
-.calendar_calToday {
-  background: #ffffcc;
-}
-.calendar_calWeek {
-  background: #ffffcc;
-  width: auto;
-  margin: 0 auto;
-  text-align: center;
-}
-.calendar_calMonth {
-  background: #ffffcc;
-  width: auto;
-  margin: 0 auto;
-  text-align: center;
-}
-/* marks a day in the colum-header as holiday
- */
-.calendar_calHoliday {
-  background: #dac0c0;
-}
-/* marks a day in the column-header additionaly as birthday of some contact,
- * it should work together with the backgrounds of calendar_calToday, calendar_calHoliday, th, row_on and row_off
- */
-.calendar_calBirthday,
-.calendar_calBirthday a {
-  color: black;
-  font-weight: bold;
-  font-style: italic;
-}
-/* timeGridWidget, contains timeRow's and dayCol's
- */
-.calendar_calTimeGrid {
-  position: relative;
-  top: 0px;
-  left: 0px;
-  border: 1px solid silver;
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  width: 99%;
-  /* set via inline style on runtime:
- *  height:
- */
-}
-.calendar_calTimeGrid.calendar_TimeGridNoLabel > .calendar_calDayCols {
-  top: 0em;
-}
-.calendar_calTimeGrid.calendar_TimeGridNoLabel > .calendar_calGridHeader {
-  top: 0em;
-}
-/* single row in the time-line, always used in conjunction with row_{on|off}, you dont need to set a bgcolor, but you can
- */
-.calendar_calTimeRow {
-  position: absolute;
-  width: 100%;
-  /* set via inline style on runtime:
- *  height:
- *  top:
- */
-}
-.calendar_calTimeRow:nth-child(odd) {
-  background-color: rgba(0, 0, 0, 0.01);
-}
-/* time in a timeRow
- */
-.calendar_calTimeRowTime {
-  padding-left: 5px;
-  height: 100%;
-  line-height: 14px;
-  font-size: 8pt;
-  text-align: left;
-}
-/* contains (multiple) dayCol's
- */
-.calendar_calDayCols,
-.calendar_calDayCols12h,
-.calendar_calDayColsNoGrid {
-  position: absolute;
-  top: 2em;
-  /*	bottom: 0px; does NOT work in IE, IE needs height: 100%! */
-  height: 100%;
-  left: 45px;
-  right: 0px;
-}
-/* 12h timeformat with am/pm
- */
-.calendar_calDayCols12h {
-  left: 65px;
-}
-/* no time grid --> no time column
- */
-.calendar_calDayColsNoTime {
-  left: 0px;
-}
-/* contains (multiple) eventCol's
- */
-.calendar_calDayCol {
-  position: absolute;
-  top: 0px;
-  height: 100%;
-  /* set via inline style on runtime:
- *  left:
- *  width:
- */
-  border-left: 1px solid silver;
-  /* Nice transition when changing days in a week */
-  -webkit-transition: 0.1s ease-in-out;
-}
-/* Calendar Id #
-*/
-#calendar-edit_id:before {
-  content: "#";
-}
-/* header for the dayCol
- */
-.calendar_calDayColHeader,
-.calendar_calGridHeader {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  right: 0px;
-  /* does not work in IE, but looks better in other browsers then width:100% */
-  text-align: center;
-  font-size: 100%;
-  white-space: nowrap;
-  border-bottom: 1px solid silver;
-  border-right: 1px solid silver;
-  height: 16px;
-  line-height: 16px;
-}
-.calendar_calDayColHeader {
-  z-index: 30;
-}
-.calendar_calDayColHeader img {
-  vertical-align: middle;
-}
-.calendar_calWeekNavHeader,
-.calendar_calMonthNavHeader {
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  right: 0px;
-  /* does not work in IE, but looks better in other browsers then width:100% */
-  text-align: center;
-  font-size: 100%;
-  white-space: nowrap;
-  border-bottom: 1px solid silver;
-  border-right: 1px solid silver;
-  height: 16px;
-  line-height: 12px;
-  z-index: 30;
-}
-.calendar_calWeekNavHeader,
-.calendar_calMonthNavHeader img {
-  vertical-align: middle;
-}
-.calendar_calViewUserNameBox {
-  position: absolute;
-  top: -1px;
-  width: 95%;
-  text-align: left;
-  font-size: 120%;
-  white-space: nowrap;
-  border: 1px solid gray;
-  height: 17px;
-  left: -1px;
-  padding-top: 0px;
-  padding-left: 10px;
-  background: #dac0c0;
-}
-.calendar_calViewUserName {
-  font-weight: normal;
-}
-.calendar_calViewUserName:first-letter {
-  text-transform: uppercase;
-}
-.calendar_calViewUserNameFirst:after {
-  content: ", ";
-}
-/* alarm_date widget disabled class
-*/
-.calendar_alarm_date_display {
-  display: none;
-}
-/*overwirte margin applied by egwGridView*/
-.calendar_alarm_grid {
-  margin-left: 0 !important;
-}
-/* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers)
- */
-.calendar_calGridHeader {
-  text-align: left;
-  padding-left: 3px;
-  z-index: 29;
-}
-#calendar-view_view tbody.ui-sortable {
-  cursor: default;
-}
-#calendar-view_view tbody.ui-sortable .calendar_calGridHeader {
-  cursor: ns-resize;
-}
-#calendar-view_view tbody.ui-sortable-disabled .calendar_calGridHeader {
-  cursor: pointer;
-}
-/* contains (multiple) events's
- */
-.calendar_calEventCol {
-  position: absolute;
-  top: 0px;
-  /*	bottom: 0px; does NOT work in IE, IE needs height: 100%! */
-  height: 100%;
-  /* set via inline style on runtime:
- *  left:
- *  width:
- */
-}
-/* contains one event: header-row & -body
- */
-.calendar_calEvent,
-.calendar_calEventPrivate {
-  position: absolute;
-  left: 0px;
-  right: 0px;
-  overflow: hidden;
-  z-index: 20;
-  border-width: 1px;
-  border-radius: 6px;
-  border-style: solid;
-  min-height: 1.2em;
-  min-width: 5px;
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  /* It is important there are no CSS transitions, it breaks resize */
-  -webkit-transition: none;
-  -moz-transition: none !important;
-  -o-transition: none !important;
-  -ms-transition: none !important;
-  transition: none !important;
-  /* set via inline style on runtime:
- *  top: depending on startime
- *  height: depending on length
- *  border-color: depending on category
- *  background: depending on category (shade)
- *
- * These are defaults:
- */
-  background-color: #808080;
-  border-color: #808080;
-}
-.calendar_calEvent:hover {
-  cursor: pointer;
-}
-/**
- * User has not accepted the invitation
- */
-.calendar_calEventUnknown {
-  background-color: white !important;
-}
-/**
- * All participants accepted the invitation
- */
-.calendar_calEventAllAccepted {
-  border-style: solid;
-  border-width: 1px;
-}
-/**
- * All participants answered the invitation, but not all accepted
- */
-.calendar_calEventAllAnswered {
-  border-style: dotted;
-  border-width: 2px;
-}
-/**
- * Some participants did NOT answer the invitation
- */
-.calendar_calEventSomeUnknown {
-  border-style: dashed;
-  border-width: 1px;
-}
-.calendar_calEventTooltip {
-  border-radius: 6px;
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  max-height: 400px;
-  overflow: auto;
-}
-.calendar_calAddEvent {
-  position: absolute;
-  width: 100%;
-  z-index: 10;
-}
-.calendar_calAddEvent:hover {
-  background-color: #D2D7FF;
-  cursor: pointer;
-}
-/* header-row of the event
- */
-.calendar_calEventHeader,
-.calendar_calEventHeaderSmall {
-  position: relative;
-  /* as the calendar_calEventIcons use postion: absolute! */
-  font-weight: bold;
-  font-size: 9pt;
-  text-align: left;
-  left: 0px;
-  right: 0px;
-  padding-left: 2px;
-  min-height: 1em;
-  /* set via inline style on runtime
- *  background-color: depending on category
- *	color: white || black depending on cat;
- */
-  background-color: #808080;
-}
-.calendar_calEventHeaderSmall {
-  font-size: 8pt;
-  line-height: 10pt;
-}
-.calendar_calEventIcons {
-  position: absolute;
-  right: 0px;
-  top: 0px;
-}
-.calendar_calEventIcons img {
-  height: 16px;
-}
-.calendar_calEventHeaderSmall .calendar_calEventIcons img {
-  height: 13px;
-}
-/* body of the event
- */
-.calendar_calEventBody,
-.calendar_calEventBodySmall {
-  padding: 0px 3px 0px;
-  left: 2px;
-  right: 2px;
-  height: 99%;
-  /* Gradient */
-  background-image: -webkit-linear-gradient(0deg, rgba(255, 255, 255, 0) 0, rgba(255, 255, 255, 0.85) 60%);
-  background-image: -moz-linear-gradient(90deg, rgba(255, 255, 255, 0) 0, rgba(255, 255, 255, 0.85) 60%);
-  background-image: linear-gradient(90deg, rgba(255, 255, 255, 0) 0, rgba(255, 255, 255, 0.85) 60%);
-  background-position: 50% 50%;
-  -webkit-background-origin: padding-box;
-  background-origin: padding-box;
-  -webkit-background-clip: border-box;
-  background-clip: border-box;
-  -webkit-background-size: auto auto;
-  background-size: auto auto;
-}
-.calendar_calEventBodySmall {
-  font-size: 95%;
-}
-.calendar_calEventLabel {
-  font-weight: bold;
-  font-size: 90%;
-}
-.calendar_calEventTitle {
-  font-weight: bold;
-  font-size: 110%;
-}
-/* table of the dayView containing 2 cols: 1) day-view, 2) todos
-*/
-.calendar_calDayView {
-  width: 100%;
-}
-/* calDayTods is the day-view's todo column, containing the calDayTodoHeader and the calDayTodoTable
- */
-.calendar_calDayTodos .calendar_calDayTodosHeader {
-  margin: 0px;
-  padding: 2px;
-  font-weight: bold;
-}
-.calendar_calDayTodos .calendar_calDayTodosTable {
-  overflow: auto;
-  max-height: 400px;
-}
-.calendar_calDayTodos {
-  width: 98%;
-  margin-left: 10px;
-  border: 1px solid silver;
-}
-.calendar_calDayTodosHeader {
-  text-align: center;
-}
-/******************************************************
- * CSS settings for the planner views (calendar_plannerWidget) *
- ******************************************************/
-/* calendar_plannerWidget represents the whole planner, consiting of the calendar_plannerHeader and multiple plannerRowWidgets
- */
-.calendar_plannerWidget {
-  position: relative;
-  top: 0px;
-  left: 0px;
-  width: 99.5%;
-  border: 1px solid gray;
-  padding-right: 3px;
-}
-.calendar_plannerWidget:nth-child(odd) {
-  background-color: #ffffff;
-}
-.calendar_plannerWidget:nth-child(even) {
-  background-color: #f2f2f2;
-}
-/* calendar_plannerHeader contains a calendar_plannerHeaderTitle and multiple calendar_plannerHeaderRows
- */
-.calendar_plannerHeader {
-  position: relative;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  background-color: #e0e0e0;
-}
-/* calendar_plannerRowWidget contains a calendar_plannerRowHeader and multiple eventRowWidgets in an calendar_eventRows
- */
-.calendar_plannerRowWidget {
-  position: relative;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  min-height: 20px;
-}
-/* calendar_plannerScale represents a scale-row of the calendar_plannerHeader, containing multiple planner{Day|Week|Month}Scales
- */
-.calendar_plannerScale,
-.calendar_plannerScaleDay {
-  position: relative;
-  top: 0px;
-  left: 0%;
-  width: 100%;
-  height: 20px;
-  line-height: 20px;
-}
-.calendar_plannerScaleDay {
-  height: 28px;
-  line-height: 14px;
-}
-.calendar_plannerDayScale,
-.calendar_plannerMonthScale,
-.calendar_plannerWeekScale,
-.calendar_plannerHourScale,
-.calendar_plannerDayOfMonthScale {
-  position: absolute;
-  top: 0px;
-  /* left+width: is set by the code on runtime */
-  text-align: center;
-  height: 100%;
-  border: 1px solid white;
-  /* set via inline style on runtime:
- *  left:
- *  width:
- */
-}
-.calendar_plannerHourScale {
-  font-size: 90%;
-}
-.calendar_plannerDayScale {
-  font-size: 90%;
-}
-.calendar_plannerWeekScale {
-  line-height: 20px;
-}
-.calendar_plannerMonthScale {
-  font-weight: bold;
-}
-.calendar_plannerDayScale img,
-.calendar_plannerWeekScale img,
-.calendar_plannerMonthScale img,
-.calendar_plannerDayOfMonthScale img {
-  vertical-align: middle;
-}
-/* calendar_plannerRowHeader contains the user or category name of the calendar_plannerRowWidget
- */
-.calendar_plannerRowHeader,
-.calendar_plannerHeaderTitle {
-  position: absolute;
-  top: 0px;
-  left: 0%;
-  width: 15%;
-  /* need to be identical for calendar_plannerRowHeader and calendar_plannerHeaderTitle and match left of calendar_eventRows/calendar_plannerHeaderRows */
-  height: 100%;
-  line-height: 20px;
-  border: 1px solid white;
-}
-/* calendar_eventRows contain multiple eventRowWidgets
- */
-.calendar_eventRows,
-.calendar_plannerHeaderRows {
-  position: relative;
-  top: 0px;
-  left: 15%;
-  /* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
-  width: 85%;
-  min-height: 20px;
-  height: 100%;
-}
-/**
- * Filler for month with less then 31 days in yearly planner
- */
-.calendar_eventRowsFiller {
-  position: absolute;
-  top: 0px;
-  height: 93%;
-  background-color: white;
-  border: 1px dashed gray;
-  border-right: none;
-}
-/**
- * Weekend or other special days in yearly planner
- */
-.calendar_eventRowsMarkedDay {
-  position: absolute;
-  top: 0px;
-  height: 100%;
-  z-index: 10;
-}
-.calendar_eventRowsMarkedDay.calendar_weekend {
-  background-color: #e0e0e0;
-}
-/* calendar_eventRowWidget contains non-overlapping events
- */
-.calendar_eventRowWidget {
-  position: relative;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  height: 20px;
-  border: 1px solid white;
-}
-.calendar_plannerEvent,
-.calendar_plannerEventPrivate {
-  position: absolute;
-  top: 0px;
-  height: 100%;
-  overflow: hidden;
-  z-index: 20;
-  border: 1px solid black;
-  min-width: 5px;
-  /* set via inline style on runtime:
- *  left: depending on startime
- *  width: depending on length
- *  background-color: depending on category
- */
-}
-.calendar_plannerEvent img,
-.calendar_plannerEventPrivate img {
-  padding-top: 2px;
-}
-.calendar_plannerEvent:hover {
-  cursor: pointer;
-}
-/* Special colors for the year view */
-.calendar_cal_year_legend_weekend {
-  background-color: #CCCCCC;
-}
-.calendar_cal_year_legend {
-  background-color: #EFEFEF;
-}
-.calendar_cal_year_legend {
-  background-color: #FFFFCC;
-  z-index: 0;
-}
-.calendar_cal_year_weekend {
-  background-color: #F9F9CC;
-  z-index: 0;
-}
-.calendar_cal_year_today {
-  border-color: #EE0000;
-  border-width: 2px;
-}
-/**
- * edit series or exception popup used in eventWidget and
- * delete series and exceptions popup used in edit event
- */
-#dialog-content {
-  display: block;
-  height: 100px;
-  padding: 6px;
-  color: #666666;
-  font-size: 13px;
-  margin: -2px -1px 0px -2px;
-  width: 410px;
-}
-/**
- * Calendar Drag and Drop
- * Class for div to show forbiden drop
- */
-.calendar_d-n-d_timeCounter > span {
-  position: absolute;
-  background-color: #808080;
-  color: white;
-  left: 0;
-  width: 100% !important;
-  align: center;
-  border: dashed white 1px;
-  border-radius: 1px;
-}
-.calendar_timeDemo {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  background-color: #808080;
-  color: white;
-  width: 100%;
-  min-width: 5em;
-  align: center;
-  border: dashed white 1px;
-  border-radius: 1px;
-}
-.calendar_d-n-d_forbiden {
-  background-color: red;
-  height: 100%;
-  width: 100%;
-  text-align: center;
-}
-/*Class for div to demonstrate dragging time*/
-.calendar_d-n-d_timeCounter {
-  font-size: 1.1em;
-  font-weight: bold;
-  text-align: center;
-}
-.calendar_d-n-d_timeCounter .loading {
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  bottom: 0px;
-  right: 0px;
-}
-#calendar-edit_action {
-  width: 10em;
-  padding-left: 10px;
-  margin-left: 5px;
-}
-#calendar-list_undelete_popup,
-#calendar-list_delete_popup {
-  display: none;
-}
-.calendar_freetime_header {
-  font-size: 120%;
-  font-weight: bold;
-}
-.calendar_freetime_timeframe {
-  position: relative;
-}
-.calendar_freetime_dow {
-  position: absolute;
-}
-img.calendar_print_button,
-img.calendar_print_appicon {
-  height: 24px;
-  width: 24px;
-}
-/*Sortable views*/
-.srotable_cal_wk_ph {
-  border: 2px	dashed gray;
-  height: 230px;
-  width: 99%;
-  background-color: #ece2f7;
-}
-.srotable_cal_day_ph {
-  position: relative;
-  width: 33.333333%;
-  height: 99%;
-  border: 2px	dashed gray;
-  background-color: #ece2f7;
-  display: inline-block;
-}
-/**
- * Home page portlets
- */
-.calendar_favorite_portlet .calendar_calMonthNavHeader a img,
-.calendar_favorite_portlet .calendar_calWeekNavHeader a img,
-.calendar_favorite_portlet .calendar_calDayColHeader a img,
-.calendar_favorite_portlet .calendar_plannerScale a img {
-  display: none;
-}
-#calendar-edit select#calendar-edit_duration {
-  width: 133px;
-}
-#calendar-edit_category {
-  max-width: 230px;
-}
-#calendar_sidebox_content .ui-datepicker div.ui-datepicker-buttonpane {
-  border-top: 0;
-  margin: 0;
-  padding-right: 3px;
-}
 /*generell*/
 .egw_fw_content_browser_iframe img[src$="svg"] {
   background-color: #828282 !important;
@@ -1480,27 +693,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 /* timeGridWidget, contains timeRow's and dayCol's
  */
 .calendar_calTimeGrid {
-  position: relative;
-  top: 0px;
-  left: 0px;
   border: 1px solid silver;
-  width: 99%;
   background-color: #f0f0f0;
   /* set via inline style on runtime:
      *  height:
      */
 }
-/* single row in the time-line, always used in conjunction with row_{on|off}, you dont need to set a bgcolor, but you can
- */
-.calendar_calTimeRow,
-.calendar_calTimeRowOff {
-  position: absolute;
-  width: 100%;
-  /* set via inline style on runtime:
-     *  height:
-     *  top:
-     */
-}
 .calendar_calTimeRow {
   /*	background-color: silver; */
   background-color: #fafafa;
@@ -1668,7 +866,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   overflow: auto;
 }
 .calendar_calAddEvent {
-  position: absolute;
   width: 100%;
   z-index: 10;
 }
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 4060384e65..3c759b42c1 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -14,7 +14,7 @@
 
 
 @import (reference) "../../../pixelegg/less/definitions.less";
-@import (less) "../default/app.css";
+@import (reference) "../default/app.css";
 
 
 
@@ -800,30 +800,17 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
     font-style: italic;
 }
 
+
 /* timeGridWidget, contains timeRow's and dayCol's
  */
 .calendar_calTimeGrid{
-    position: relative;
-    top: 0px;
-    left: 0px;
     border:1px solid silver;
-    width: 99%;
     .background_color_10_gray;
     /* set via inline style on runtime:
      *  height:
      */
 }
 
-/* single row in the time-line, always used in conjunction with row_{on|off}, you dont need to set a bgcolor, but you can
- */
-.calendar_calTimeRow,.calendar_calTimeRowOff{
-    position: absolute;
-    width: 100%;
-    /* set via inline style on runtime:
-     *  height:
-     *  top:
-     */
-}
 .calendar_calTimeRow{
     /*	background-color: silver; */
     .background_color_5_gray;

From 5c812f8c9adcaf892c6fcc6c26b102826dcb6d6c Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 6 Oct 2015 08:45:44 +0000
Subject: [PATCH 082/130] Remove extra ajax-loader icon from mail tree

---
 mail/templates/default/app.css  | 2 --
 mail/templates/pixelegg/app.css | 1 -
 2 files changed, 3 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 8c4cdeaac5..bb9f6a9220 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -697,8 +697,6 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
 	width: 100%;
 	height: 100%;
 	z-index: 10000;
-	// only change styling below:
-	background-image: url(../../../phpgwapi/templates/default/images/ajax-loader.gif);
 	background-position: left top;
 	background-repeat: no-repeat;
 }
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index baa069b8ce..7fd376f289 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -697,7 +697,6 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
   width: 100%;
   height: 100%;
   z-index: 10000;
-  background-image: url(../../../phpgwapi/templates/default/images/ajax-loader.gif);
   background-position: left top;
   background-repeat: no-repeat;
 }

From 658dcb121e8f39cbe6b688f6020f2d8c75881acd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 6 Oct 2015 10:49:36 +0000
Subject: [PATCH 083/130] * Calendar: use event title for mails generated via
 edit popup actions: mail all participants and meeting request

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

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 5de19f9b73..77561de5cc 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1158,7 +1158,7 @@ class calendar_uiforms extends calendar_ui
 			'menuaction'      => 'mail.mail_compose.compose',
 			'mimeType'		  => 'plain', // force type to plain as thunderbird seems to try to be smart while parsing html messages with ics attachments
 			'preset[to]'      => $to,
-			'preset[subject]' => $subject,
+			'preset[subject]' => $event['title'],
 			'preset[body]'    => $body,
 			'preset[name]'    => 'event.ics',
 			'preset[file]'    => $ics_file,

From fe9dcbcc12da6a55e003048ccc2452b87c967e10 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 6 Oct 2015 10:51:35 +0000
Subject: [PATCH 084/130] Get folders status asynchronously as it is an
 expensive operation to be called in initial load

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

diff --git a/mail/inc/class.mail_tree.inc.php b/mail/inc/class.mail_tree.inc.php
index b35b4ca0c4..0642684eec 100644
--- a/mail/inc/class.mail_tree.inc.php
+++ b/mail/inc/class.mail_tree.inc.php
@@ -240,7 +240,7 @@ class mail_tree
 				}
 
 				//List of folders
-				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo?0:2,$_subscribedOnly, true);
+				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo?0:2,$_subscribedOnly, false);
 				foreach ($foldersList as &$folder)
 				{
 					$path = $parent = $parts = explode($folder['delimiter'], $folder['MAILBOX']);
diff --git a/mail/js/app.js b/mail/js/app.js
index f84b8d6e97..2d6018e0d0 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -169,7 +169,10 @@ app.classes.mail = AppJS.extend(
 				var nm = this.et2.getWidgetById(this.nm_index);
 				this.mail_isMainWindow = true;
 				this.mail_disablePreviewArea(true);
-
+				
+				//Get initial folder status
+				this.mail_refreshFolderStatus(undefined,undefined,false);
+				
 				// Bind to nextmatch refresh to update folder status
 				if(nm != null && (typeof jQuery._data(nm).events=='undefined'||typeof jQuery._data(nm).events.refresh == 'undefined'))
 				{

From 39d9004e427dd9aa829b2f32ad5cbed696188958 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 6 Oct 2015 12:20:32 +0000
Subject: [PATCH 085/130] * Calendar/eSync: iOS 9.0.2 (maybe other clients and
 versions too) moved start- and end-date of synchronised meeting requests to
 date of sync

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

diff --git a/calendar/inc/class.calendar_activesync.inc.php b/calendar/inc/class.calendar_activesync.inc.php
index 4cb3520dc7..c28f98c9e4 100644
--- a/calendar/inc/class.calendar_activesync.inc.php
+++ b/calendar/inc/class.calendar_activesync.inc.php
@@ -618,7 +618,7 @@ return array();	// temporary disabling meeting requests from calendar
 			'end' => 'endtime',
 		) as $key => $attr)
 		{
-			$event[$key] = egw_time::server2user($message->$attr);
+			if (isset($message->$attr)) $event[$key] = egw_time::server2user($message->$attr);
 		}
 		// copying strings
 		foreach(array(

From 121f5dc68d5f9e8cbfe9d259b444f51f4937ad09 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 6 Oct 2015 12:21:54 +0000
Subject: [PATCH 086/130] dito for zPush2: iOS 9.0.2 (maybe other clients and
 versions too) moved start- and end-date of synchronised meeting requests to
 date of sync

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

diff --git a/calendar/inc/class.calendar_zpush.inc.php b/calendar/inc/class.calendar_zpush.inc.php
index fd6c7d8ff1..5294b86329 100644
--- a/calendar/inc/class.calendar_zpush.inc.php
+++ b/calendar/inc/class.calendar_zpush.inc.php
@@ -619,7 +619,7 @@ return array();	// temporary disabling meeting requests from calendar
 			'end' => 'endtime',
 		) as $key => $attr)
 		{
-			$event[$key] = egw_time::server2user($message->$attr);
+			if (isset($message->$attr)) $event[$key] = egw_time::server2user($message->$attr);
 		}
 		// copying strings
 		foreach(array(

From f724e47b2d8aa591d6d812ec25b049af8fc50e92 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 6 Oct 2015 13:11:05 +0000
Subject: [PATCH 087/130] cant use @-syntax with passwords, as they can start
 with an @

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

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 977b71669b..c7a842bdf6 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -347,7 +347,7 @@ class egw_db
 		{
 			$this->Type = $GLOBALS['egw_info']['server']['db_type'];
 		}
-		foreach(array('Database', 'Host', 'Port', 'User', 'Password', 'Type') as $var)
+		foreach(array('Database', 'Host', 'Port', 'User', 'Type') as $var)
 		{
 			$val = (string)$this->$var;
 			if ($val[0] === '@') $this->$var = getenv(substr($val, 1));

From ab4b0e1e17e64cc7c191a9b971bf74f60bd67960 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 6 Oct 2015 15:09:10 +0000
Subject: [PATCH 088/130] only do the sorting when we do a topLevel Query or a
 retrieval of ALL. ; give extracare on the retrieval of folders in shared and
 others on subscription, and when folders subscribed in such namespaces are
 deeply nested within without rights of list on the branches leading to the
 leaf

---
 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 c44da59b2d..4a1fe63b61 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -268,7 +268,7 @@ class mail_ui
 		}
 		// Initial tree's options, the rest would be loaded dynamicaly by autoloading,
 		// triggered from client-side. Also, we keep this here as
-		$sel_options['foldertree'] =  $this->mail_tree->getTree(null,$profileId,1,true);
+		$sel_options['foldertree'] =  $this->mail_tree->getTree(null,$profileId,1,true,false,true);
 
 		//Get all subscribed folders
 		// as getting all subscribed folders is very fast operation

From aa81ae5e5dcb8d0188553dadbe96951f1301b068 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 6 Oct 2015 16:37:51 +0000
Subject: [PATCH 089/130] WIP EGroupware tutorial: - Make popup size bigger -
 Style tutorials list

---
 etemplate/templates/default/egw_tutorial.xet | 6 +++---
 phpgwapi/js/jsapi/app_base.js                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etemplate/templates/default/egw_tutorial.xet b/etemplate/templates/default/egw_tutorial.xet
index e6fc177a01..eae0e917f7 100644
--- a/etemplate/templates/default/egw_tutorial.xet
+++ b/etemplate/templates/default/egw_tutorial.xet
@@ -9,10 +9,10 @@
 			</columns>
 			<rows>
 				<row >
-					<hbox onclick="$row_cont[onclick]">
-						<image src="$row_cont[thumbnail]" height="70px"/>
+					<vbox onclick="$row_cont[onclick]" align="center" statustext="$row_cont[title]">
 						<description value = "$row_cont[title]" class="et2_ellipsis"/>
-					</hbox>
+						<image src="$row_cont[thumbnail]" height="70px"/>
+					</vbox>
 				</row>
 			</rows>
 		</grid>
diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index 6885bf6704..a2319c66f7 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -1061,7 +1061,7 @@ var AppJS = Class.extend(
 	egwTutorialPopup: function (_tuid)
 	{
 		var url = egw.link('/index.php', 'menuaction=home.home_tutorial_ui.popup&tuid='+_tuid);
-		egw.open_link(url,'_blank','500x400');
+		egw.open_link(url,'_blank','750x580');
 	},
 	
 	/**

From 1e54cfb11752d775b26749534eb2dd23075ee4ea Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 6 Oct 2015 16:59:54 +0000
Subject: [PATCH 090/130] use same egw_exception_db_connection instead of die,
 if no DB host set, so it can be cought

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

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index c7a842bdf6..b3d249d485 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -378,7 +378,7 @@ class egw_db
 		}
 		if (!isset($e))
 		{
-			die('No DB Host set!');
+			$e = new egw_exception_db_connection('No DB host set!');
 		}
 		throw $e;
 	}

From a269120683b02331bc4889da1a68a9de0de18943 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 6 Oct 2015 19:57:52 +0000
Subject: [PATCH 091/130] move @/enviroment support from class-variables to
 local ones, to re-evaluate them on each request, class vars are stored in
 session

---
 phpgwapi/inc/class.egw_db.inc.php | 47 +++++++++++++++----------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index b3d249d485..1b9c5eac8f 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -347,11 +347,6 @@ class egw_db
 		{
 			$this->Type = $GLOBALS['egw_info']['server']['db_type'];
 		}
-		foreach(array('Database', 'Host', 'Port', 'User', 'Type') as $var)
-		{
-			$val = (string)$this->$var;
-			if ($val[0] === '@') $this->$var = getenv(substr($val, 1));
-		}
 		// on connection failure re-try with an other host
 		// remembering in session which host we used last time
 		$use_host_from_session = true;
@@ -420,7 +415,7 @@ class egw_db
 	 */
 	public function get_host($next = false)
 	{
-		$hosts = explode(';', $this->Host);
+		$hosts = explode(';', $this->Host[0] == '@' ? getenv(substr($this->Host, 1)) : $this->Host);
 		$num_hosts = count($hosts);
 		$n =& egw_cache::getSession(__CLASS__, $this->Host);
 		if (!isset($n)) $n = 0;
@@ -449,43 +444,45 @@ class egw_db
 	{
 		if (!$this->Link_ID)
 		{
-			foreach(array('Database','User','Password') as $name)
+			$Database = $User = $Password = $Port = $Type = '';
+			foreach(array('Database','User','Password','Port','Type') as $name)
 			{
 				$$name = $this->$name;
+				if (${$name}[0] == '@' && $name != 'Password') $$name = getenv(substr($$name, 1));
 			}
-			$this->setupType = $php_extension = $type = $this->Type;
+			$this->setupType = $php_extension = $Type;
 
-			switch($this->Type)	// convert to ADO db-type-names
+			switch($Type)	// convert to ADO db-type-names
 			{
 				case 'pgsql':
 					$type = 'postgres'; // name in ADOdb
 					// create our own pgsql connection-string, to allow unix domain soccets if !$Host
-					$Host = "dbname=$this->Database".($Host ? " host=$Host".($this->Port ? " port=$this->Port" : '') : '').
-						" user=$this->User".($this->Password ? " password='".addslashes($this->Password)."'" : '');
+					$Host = "dbname=$Database".($Host ? " host=$Host".($Port ? " port=$Port" : '') : '').
+						" user=$User".($Password ? " password='".addslashes($Password)."'" : '');
 					$User = $Password = $Database = '';	// to indicate $Host is a connection-string
 					break;
 
 				case 'odbc_mssql':
 					$php_extension = 'odbc';
-					$this->Type = 'mssql';
+					$Type = 'mssql';
 					// fall through
 				case 'mssql':
-					if ($this->Port) $Host .= ','.$this->Port;
+					if ($Port) $Host .= ','.$Port;
 					break;
 
 				case 'odbc_oracle':
 					$php_extension = 'odbc';
-					$this->Type = 'oracle';
+					$Type = 'oracle';
 					break;
 				case 'oracle':
-					$php_extension = $type = 'oci8';
+					$php_extension = $Type = 'oci8';
 					break;
 
 				case 'sapdb':
-					$this->Type = 'maxdb';
+					$Type = 'maxdb';
 					// fall through
 				case 'maxdb':
-					$type ='sapdb';	// name in ADOdb
+					$Type ='sapdb';	// name in ADOdb
 					$php_extension = 'odbc';
 					break;
 
@@ -493,10 +490,10 @@ class egw_db
 					$php_extension = 'mysql';	// you can use $this->setupType to determine if it's mysqlt or mysql
 					// fall through
 				case 'mysqli':
-					$this->Type = 'mysql';
+					$this->Type = 'mysql';		// need to be "mysql", so apps can check just for "mysql"!
 					// fall through
 				default:
-					if ($this->Port) $Host .= ':'.$this->Port;
+					if ($Port) $Host .= ':'.$Port;
 					break;
 			}
 			if (!isset($GLOBALS['egw']->ADOdb) ||	// we have no connection so far
@@ -519,10 +516,10 @@ class egw_db
 				{
 					$this->privat_Link_ID = True;	// remember that we use a privat Link_ID for disconnect
 				}
-				$this->Link_ID = ADONewConnection($type);
+				$this->Link_ID = ADONewConnection($Type);
 				if (!$this->Link_ID)
 				{
-					throw new egw_exception_db_connection("No ADOdb support for '$type' ($this->Type) !!!");
+					throw new egw_exception_db_connection("No ADOdb support for '$Type' ($this->Type) !!!");
 				}
 				$connect = $GLOBALS['egw_info']['server']['db_persistent'] ? 'PConnect' : 'Connect';
 				if (($Ok = $this->Link_ID->$connect($Host, $User, $Password, $Database)))
@@ -538,12 +535,12 @@ class egw_db
 				if ($this->Debug)
 				{
 					echo function_backtrace();
-					echo "<p>new ADOdb connection to $this->Type://$this->Host/$this->Database: Link_ID".($this->Link_ID === $GLOBALS['egw']->ADOdb ? '===' : '!==')."\$GLOBALS[egw]->ADOdb</p>";
+					echo "<p>new ADOdb connection to $Type://$Host/$Database: Link_ID".($this->Link_ID === $GLOBALS['egw']->ADOdb ? '===' : '!==')."\$GLOBALS[egw]->ADOdb</p>";
 					//echo "<p>".print_r($this->Link_ID->ServerInfo(),true)."</p>\n";
 					_debug_array($this);
 					echo "\$GLOBALS[egw]->db="; _debug_array($GLOBALS[egw]->db);
 				}
-				if ($this->Type == 'mssql')
+				if ($Type == 'mssql')
 				{
 					// this is the format ADOdb expects
 					$this->Link_ID->Execute('SET DATEFORMAT ymd');
@@ -560,8 +557,8 @@ class egw_db
 		}
 		if (!$this->Link_ID->isConnected() && !$this->Link_ID->Connect())
 		{
-			$Host = preg_replace('/password=[^ ]+/','password=$Password',$this->Host);	// eg. postgres dsn contains password
-			throw new egw_exception_db_connection("ADOdb::$connect($Host, $this->User, \$Password, $this->Database) reconnect failed.");
+			$Host = preg_replace('/password=[^ ]+/','password=$Password',$Host);	// eg. postgres dsn contains password
+			throw new egw_exception_db_connection("ADOdb::$connect($Host, $User, \$Password, $Database) reconnect failed.");
 		}
 
 		if ($new_connection)

From f57ccb9a4160d3d7f61488dcca4bf75a1142d47e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 6 Oct 2015 19:59:43 +0000
Subject: [PATCH 092/130] Allow custom fields in IF placeholders

---
 etemplate/inc/class.bo_merge.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 7d8d747332..a2472223d2 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -1364,19 +1364,19 @@ abstract class bo_merge
 		if (strpos($content,'$$IF') !== false)
 		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$IF ([0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NELF') !== false)
 		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NELF ([0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NENVLF') !== false)
 		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NENVLF ([0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$LETTERPREFIX$$') !== false)
@@ -1387,7 +1387,7 @@ abstract class bo_merge
 		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
 		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		return $content;

From 82cf5184e33c2b53ec48fa17fd0e45cefc50c42f Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 6 Oct 2015 22:47:45 +0000
Subject: [PATCH 093/130] Fix class colors on events went missing

---
 calendar/templates/default/app.css  | 4 +++-
 calendar/templates/pixelegg/app.css | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 8e38c4378a..c54019d79c 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -355,8 +355,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
  *  border-color: depending on category
  *  background: depending on category (shade)
  *
- * These are defaults:
  */
+}
+.calendar_calEvent:not([class*="cat_"]) {
+	/* Defaults for no category, so we don't override it */
 	background-color: #808080;
 	border-color: #808080;
 }
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 957f35e5f8..3934f1b56f 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -866,6 +866,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   overflow: auto;
 }
 .calendar_calAddEvent {
+  position: absolute;
   width: 100%;
   z-index: 10;
 }

From 50ed21bd7e26ef525ea1b44117735d729604cd61 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 7 Oct 2015 05:29:49 +0000
Subject: [PATCH 094/130] fixed typo (wrong case) causing default DB
 capabilities to be returned and eg. giving an sql error when searching under
 MySQL in addressbook

---
 phpgwapi/inc/class.egw_db.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 1b9c5eac8f..367a87d802 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -455,7 +455,7 @@ class egw_db
 			switch($Type)	// convert to ADO db-type-names
 			{
 				case 'pgsql':
-					$type = 'postgres'; // name in ADOdb
+					$Type = 'postgres'; // name in ADOdb
 					// create our own pgsql connection-string, to allow unix domain soccets if !$Host
 					$Host = "dbname=$Database".($Host ? " host=$Host".($Port ? " port=$Port" : '') : '').
 						" user=$User".($Password ? " password='".addslashes($Password)."'" : '');
@@ -525,7 +525,7 @@ class egw_db
 				if (($Ok = $this->Link_ID->$connect($Host, $User, $Password, $Database)))
 				{
 					$this->ServerInfo = $this->Link_ID->ServerInfo();
-					$this->set_capabilities($type,$this->ServerInfo['version']);
+					$this->set_capabilities($Type,$this->ServerInfo['version']);
 				}
 				if (!$Ok)
 				{

From 3253b6bda1d7be8e53b82a4e43b45e9b57451946 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 7 Oct 2015 09:31:10 +0000
Subject: [PATCH 095/130] * Addressbook: allow eg. telephone apps to jump
 directly into CRM view of a phonenumber with
 https://domain.com/egroupware/index.php?menuaction=addressbook.addressbook_ui.view&search="49
 123 456789"&ajax=true&cd=yes

---
 addressbook/inc/class.addressbook_ui.inc.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 37504a97a1..a28a029cb1 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -2515,6 +2515,24 @@ window.egw_LAB.wait(function() {
 		}
 		else
 		{
+			// allow to search eg. for a phone number
+			if (isset($_GET['search']))
+			{
+				$query = egw_session::appsession('index', 'addressbook');
+				$query['search'] = $_GET['search'];
+				unset($_GET['search']);
+				// reset all filters
+				unset($query['advanced_search']);
+				$query['col_filter'] = array();
+				$query['filter'] = $query['filter2'] = $query['cat_id'] = '';
+				egw_session::appsession('index', 'addressbook', $query);
+				$query['start'] = 0;
+				$query['num_rows'] = 1;
+				$rows = $readonlys = array();
+				$num_rows = $this->get_rows($query, $rows, $readonlys, true);
+				$_GET['contact_id'] = array_shift($rows);
+				$_GET['index'] = 0;
+			}
 			$contact_id = $_GET['contact_id'] ? $_GET['contact_id'] : ((int)$_GET['account_id'] ? 'account:'.(int)$_GET['account_id'] : 0);
 			if(!$contact_id || !is_array($content = $this->read($contact_id)))
 			{
@@ -2522,7 +2540,7 @@ window.egw_LAB.wait(function() {
 					'menuaction' => 'addressbook.addressbook_ui.index',
 					'msg' => $content,
 					'ajax' => 'true'
-				));
+				)+(isset($_GET['search']) ? array('search' => $_GET['search']) : array()));
 			}
 			if (isset($_GET['index']))
 			{

From f8821f692ff370ef4ac6e0424a1ff049087cae2d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 7 Oct 2015 09:32:22 +0000
Subject: [PATCH 096/130] fix an other case were spinner is not removed due to
 a client-side javascript error

---
 phpgwapi/js/framework/fw_browser.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js
index 015240bc37..d4faab33c8 100644
--- a/phpgwapi/js/framework/fw_browser.js
+++ b/phpgwapi/js/framework/fw_browser.js
@@ -155,15 +155,15 @@ var fw_browser =  Class.extend({
 		var self = this;
 		this.ajaxLoaderDiv = jQuery('<div class="loading ui-widget-overlay ui-front">'+egw.lang('please wait...')+'</div>').insertBefore(this.baseDiv);
 		this.loadingDeferred = new jQuery.Deferred();
-		
+
 		// Try to escape from infinitive not resolved loadingDeferred
 		// At least user can close the broken tab and work with the others.
 		// Define a escape timeout for 5 sec
 		this.ajaxLoaderDivTimeout = setTimeout(function(){
-			self.ajaxLoaderDiv.hide().remove();
+			(self.ajaxLoaderDiv || jQuery('div.loading')).hide().remove();
 			self.ajaxLoaderDiv = null;
 		},5000);
-			
+
 		this.loadingDeferred.always(function() {
 			if(self.ajaxLoaderDiv)
 			{
@@ -173,7 +173,7 @@ var fw_browser =  Class.extend({
 				clearTimeout(self.ajaxLoaderDivTimeout);
 			}
 		});
-		
+
 		// Check whether the given url is a pseudo url which should be executed
 		// by calling the ajax_exec function
 		// we now send whole url back to server, so apps can use $_GET['ajax']==='true'

From 6e6e9c55bdd62155f6282b5197c0981782520b61 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 7 Oct 2015 12:05:12 +0000
Subject: [PATCH 097/130] replace cnr-pending icon for current users status is
 "needs-action" with regular needs-action icon, fixes icon does not exist in
 other templates

---
 calendar/inc/class.calendar_ui.inc.php |   2 +-
 pixelegg/images/cnr-pending.png        | Bin 3010 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100755 pixelegg/images/cnr-pending.png

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 0b4b1ec94e..28f1330657 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -507,7 +507,7 @@ class calendar_ui
 		}
 		if($event['participants'][$this->user][0] == 'U')
 		{
-			$icons[] = html::image('calendar','cnr-pending',lang('Needs action'));
+			$icons[] = html::image('calendar','needs-action',lang('Needs action'));
 		}
 		return $icons;
 	}
diff --git a/pixelegg/images/cnr-pending.png b/pixelegg/images/cnr-pending.png
deleted file mode 100755
index 60a4a2d242ccab7ddaf1c2f773c3f74937b4c9de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3010
zcmbVOdpK0<8XuQJo1|i7a!jKOikUHH#!Q5{xlS&*42Er(!Q?VyW@^T`hv<|`2!~xH
zB`Ml%<(7LPijbt_8nz<Bu1(Qd+S%tk&)LuZ<9yFr>-)ZUz3=b6e`}qwJ8G`5MQsZR
z1X8fHAUOatbp4jy3_ST_@e(lY5|C+vV;o<Bkilbt%$OW+7Su9`;m2}dF_@ttk61<^
zkd!~$ktU!~ZSX#vAU(!9kDe%q3rK@NMkXRI!zX|xfO@n1*uloIxte+yl+84TxuB^C
zDwoLeXIqGQtYhM%jy~c59~={Aas+B5!UF(7ECB;53JMJ7<3+}>Z@741y-tS1px;;o
z0miUDjG|HPphOOj1x4$jbbSy=Bou?uLmHql7~~<SJ_4x^M*tT_7ioY;WAOS|==T8w
zwDFj}cn1>YyDng74D%NVxOg~RC=}`mQF<Jn9~_Cp;np$q^>qObU4Ce=fFaTi=4);s
zkXU>l9-Av*bAqAkhzxJe34t*Tu=EcXg1A)bpTNQV?|}kB1{X27aHJjr9u&0h*Eepy
zz=8E2GyamB?-<Hu!5vt9&Iz6mkPlzY4PhX5f3Ikr5wHet%VPscVFZ#mJ|}`$!2(N?
zF${R4$7D0{2$UfZMXUh=tB=4KB9Vp&LlhZ@#1XJ06a}Y`-N5)OSu+aR%n%p|lmP~b
zB%^RdG!loPP;h8635_KfY{*&$^977xAJ&FmHlX*rEcS0@@kAbrA>i;FIh??a3b6C%
z2snIy4i`#1hJk8P89wabb%OSKg8uNA#Nx3}vX~SeCkXm2!g%&ySb)&~U(ZPt6dH{p
zQ7{BF682q|`Ts->4j2PpFOUB!mkkn7gX_ybiyzqh**>gbpl5hMb6`Dm#z7#Nc}tR+
zqv&N}7TYG{opP&RXhH<!qxvT1F{tEmr^@3_7FK1E(4qam#aga9Lv~z2CaL)x>VD>L
zW59OnUFubSr!YCxQkic`4<Rb0QU`XMom4#?@qDdQTE4<XwcM7sP`6mu_4%jSsI{qc
z;>F1)I<8w2nzfJLeW`ut<J>SD%eL5hM^cUuo*KfG4NY*=OaklCx!3Ewiywk&UccX&
zL>UhkeO-%qk_5p<8lzCZOueoVHr~2*Yg9@~YNfbX+xC}%nHK#pvG{0wT%78T9XrCD
zZ_<#7-CrLhe*Q7A;Tkp9(Yd5=dA$3Ic}{zKyY$Yf{{DXO^S-{TF9I<dJ73;)yG4XO
z@I<%ZS>fUISbr%=NlJg&kHc|$Ot?0iPOD}fkH+ZeSjBI5a&o%xeyBFADmFG&hBI8}
z;e}95Gd40R$6xH!n?rgJ4i86Jl=Ul)t`@2`@v#~j8lRVz%EO36;-TSd4_aIOylke@
z57>$)d#bbjo12@Rx-J>>OK#nI@@0OsIq&^oRr<r2#<9D!#HPBLnVA)Iz;nkkx4Sn^
z3s-dA?>X)}a6p)Tijn@PaQt5>Wo2dK<E<$%bHnwD7M7N0UfpIicNE#?C0Cy_6$&eo
z1N^P6J4)}|xx;B`X(8++hd?uzmX`1tUk_+&Pq$W9R#s1S<$*n_coUEU-=@SKR!3&i
zgO(Pxfq?zqdptcolh@WFO<<#^W28uzTP{d!8T&f+@a*vR_`$lmI<2Mv8M~7^>(3=7
zR=Uw>BC7mub@iksYrc(*jbhlL=nv>mo8M^G7uD9*7KMzs#KgonM?=i5B84Lj63tco
zsdg~RR4ThbHex6j%Sju2{dzVHOrU9~sC=A5`E}A+DTPghwIr>Y+X4Nh)}j?~!PAF}
zm_j+9lJl8B3Div*CFJGhsoPxTJ--wyqj&?HWEvJ0=4@_m4&65y3&xoC5!oKNu#Y#P
zZWnTM1B&o_v(g9ayB<9%PMf;#VjTH}_WOubK{H4gT|9Bqu1C#UC)_ds(J7l^a7a}G
zvtRNjgjr37vdrCu`{73%K0KC}J@CBLBS58e+xaOFwarg*no^Cp50QFRyj7<2#c*8&
zL~rjsnzB~3-nOUGUeQvDHqXit?k_GA6Rue_wiVfFw|5=NO3_t0t8?&R$J*PzlJ3&d
z(vTaCdsIiyDd8$ADqP_5?XFW*o4eH956~M2bUXQb)P+rR@qKDMKUl)95e7tNm!ifI
z`s0@B_$C(*58dUyq5GkH<@PoCOi8W2wfubOj&Av!?Cklv6YreO+}+*Zym?ayz8WO)
zA~bav)2VW9H9y}@ra<{aVit-@r80zbLmpBlOY4<<u<M;lV`>H$x&W!OoST`EmuZ7T
zZ|^GJt3!xYLY_Z=zNr93vLIe1XJll=sVFOJt1|4`iZ<o!TXDXqnx2#M(j0$j>|u7C
zl{oGPsU@zNwV7EXq`@ybS>}55-qG#ty(?!H`;IRMT@eS)@ZoT{?W-E$ob#r$euY1K
zT}%c?ehF@CYr8%od^g=&lmPBIq~vqvloG?D^VjjuPe|U7{%qIBUkaqJ_BQ1^BQ$@f
zmD&yOC$RQLMLLoayZs+alcElvc>Aot03Q&&3+a$N?d4@lCX?UJ&vOmzPdt9L*zwY3
zXU#Tn#j4r@Dmyjx>ERmJMWEG0PdzFh_+BGUSG-wM1UkJ-WugZ?^>T$^-D4$(wXQno
zfDzngs3iyv59j3MJSZ<OpG)42(|4xR!z0!bT9eh?AF&Q@(Gk8M9H3N2DK`C}VI)d@
zc==MPQ64oWXrlc>QsHb^XW6q$h9R(jrqpUdY}Kr!Kji?O$Zb$f&C9FLOtbIIGvP$X
z5g1kVnVFd?6m#>UtqKb9cBc>jx@SO30PdRFU%aXLYA==Oh&I65udUKiZ(9l~%AGiu
z?c4X}gp29-MaaBK)X%}Mt9QQ@?)r7sv=}>bW+XyJp-6Tv-TtOZ7kJT41*f4ogD(G+
z2An!;OU3FtB&t?Gb^cnoozC(~8ImLjjeDhp+;qIVu)S%|KlE3hej)<L=-8D1K%eBB
z)$%#DmB+*Oo*(OHMU*%lS)yyfZmsc5`lw_Hz0q99>bK|<A|{ihShA^e(tY;S0Y}xL
z&bVh*g-6v*BJWT07o#C#KkN$|D+d3=ZHfbBI%iW`O1-9Yc<^?QiCkk0_nB-Fy`{||
zBSqIBRW>)Iw6*-PIPNuZ^3-xJ(?ZGhZN8kZbl_bZdl&ogP<tZlh3Pd}CynR#da?~v
zFMGC|F5?(9B=W6E?4_^d0nba2W$<>^J@Q9~tS1Ir;geBO4XPbxo%Ua>eZvvGDGPX*
zNN&P<B?YRq%_`%=jr5p;h|eEqleYET7U;Qva_i@5brDpZvspI=*`S+#JC2y+=ksyE
z$0h_wH~a%(vwTv?ipp)IasSlBgok8yl#zJJzc-6SRWd+TxaQ>M%1Eb@8k3eAF5a*!
z^{BZgVN)r$V3Ht~fLw8#U6|-7BfQS4pRB+9i(gs*vgw>sgtxT4J*XgA-2Xu%q?SaW
z+{0C0xNd5--@kfunzq@p?Ts>eJ3Y~FSCIH*gQG>fo9_|!#V;HS>7N?qb+`DuGMwnE
z75{czin1y-q3HOv)q$vD5@xEIMhnx_@1{5?$(6q%iOI73D_e<S=UYknfxtnPSyjLE
eW6j#Z2GHHXws{3o;Fa~iYD@A_QYpdf)V~4kvKqkv


From f89d4297d95fa5a74d18c7c4b5ea0288f5f51b68 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 7 Oct 2015 13:52:56 +0000
Subject: [PATCH 098/130] Fix infinitive request from selectbox widget

---
 etemplate/js/et2_widget_selectbox.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js
index bc313e4a44..1d1827c35b 100644
--- a/etemplate/js/et2_widget_selectbox.js
+++ b/etemplate/js/et2_widget_selectbox.js
@@ -1131,7 +1131,9 @@ jQuery.extend(et2_selectbox,
 		else
 		{
 			// Check that the value is in there
-			if(attrs.value)
+			// Make sure we are not requesting server for an empty value option
+			// as server won't find anything and it will fall into an infinitive loop
+			if(attrs.value && attrs.value != "" && attrs.value != "0")
 			{
 				var missing_option = true;
 				for(var i = 0; i < cache.length && missing_option; i++)

From b92679589838960b2098af27e98beebd8f6ee042 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 7 Oct 2015 15:34:37 +0000
Subject: [PATCH 099/130] Fix integrated apps were opening in calendar edit

---
 calendar/js/app.js | 47 +++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 4a4a7fd30d..c511152508 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -1051,21 +1051,27 @@ app.classes.calendar = AppJS.extend(
 	 */
 	cal_open: function(_action, _senders)
 	{
-
-		if(_action.parent.data && _action.parent.data.nextmatch)
-		{
-			var js_integration_data = _action.parent.data.nextmatch.options.settings.js_integration_data || this.et2.getArrayMgr('content').data.nm.js_integration_data;
-		}
+		// Check for series
 		var id = _senders[0].id;
 		var matches = id.match(/^(?:calendar::)?([0-9]+):([0-9]+)$/);
-		var backup = _action.data;
 		if (matches)
 		{
 			this.edit_series(matches[1],matches[2]);
 			return;
 		}
-		matches = id.match(/^([a-z_-]+)([0-9]+)/i);
-		if (matches && js_integration_data)
+		
+		// Check for other app integration data sent from server
+		var backup = _action.data;
+		if(_action.parent.data && _action.parent.data.nextmatch)
+		{
+			var js_integration_data = _action.parent.data.nextmatch.options.settings.js_integration_data || this.et2.getArrayMgr('content').data.nm.js_integration_data;
+			if(typeof js_integration_data == 'string')
+			{
+				js_integration_data = JSON.parse(js_integration_data);
+			}
+		}
+		matches = id.match(/^calendar::([a-z_-]+)([0-9]+)/i);
+		if (matches && js_integration_data && js_integration_data[matches[1]])
 		{
 			var app = matches[1];
 			_action.data.url = window.egw_webserverUrl+'/index.php?';
@@ -1076,20 +1082,23 @@ app.classes.calendar = AppJS.extend(
 
 			if (js_integration_data[app].edit_popup)
 			{
-				matches = js_integration_data[app].edit_popup.match(/^(.*)x(.*)$/);
-				if (matches)
-				{
-					_action.data.width = matches[1];
-					_action.data.height = matches[2];
-				}
-				else
-				{
-					_action.data.nm_action = 'location';
-				}
+				egw.open_link(_action.data.url,'_blank',js_integration_data[app].edit_popup,app);
+
+				_action.data = backup;	// restore url, width, height, nm_action
+				return;
 			}
 		}
+		else
+		{
+			// Other app integration using link registry
+			var data = egw.dataGetUIDdata(_senders[0].id);
+			if(data && data.data)
+			{
+				return egw.open(data.data.app_id, data.data.app, 'edit');
+			}
+		}
+		// Regular, single event
 		egw.open(id.replace(/^calendar::/g,''),'calendar','edit');
-		_action.data = backup;	// restore url, width, height, nm_action
 	},
 
 	/**

From 8fa12bc9d548b01eaac9fae15ac61eecb7b91288 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 7 Oct 2015 15:49:51 +0000
Subject: [PATCH 100/130] WIP EGroupware tutorial: - Implement tutorials
 navigator in tutorial popup

---
 home/inc/class.home_tutorial_ui.inc.php | 37 +++++++++++++++++++----
 home/js/app.js                          | 40 +++++++++++++++++++++++++
 home/templates/default/tutorial.xet     | 10 ++++++-
 3 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/home/inc/class.home_tutorial_ui.inc.php b/home/inc/class.home_tutorial_ui.inc.php
index a93ffb9cb4..86dacc5a0e 100644
--- a/home/inc/class.home_tutorial_ui.inc.php
+++ b/home/inc/class.home_tutorial_ui.inc.php
@@ -34,13 +34,38 @@ class home_tutorial_ui {
 		
 		// Get tutorial object id
 		$tuid_indx = explode('-',$_GET['tuid']);
-		
-		// read tutorials json file to fetch data
-		$tutorials = json_decode(self::getJsonData(), true);
-		
-		$content = $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]];
+		if (!is_array($content))
+		{
+			// read tutorials json file to fetch data
+			$tutorials = json_decode(self::getJsonData(), true);
+			$apps = array();
+			foreach ($tutorials as $app => $val)
+			{
+				$apps [$app] = $app;
+			}
+			$sel_options = array(
+				'apps' => $apps,
+			);
+			$content = array (
+				'src' => $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]['src'],
+				'title' => $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]['title'],
+			);
+		}
 				
-		$tmpl->exec('home.home_tutorial_ui.popup', $content,array(),array(),array(),array(),2);
+		$tmpl->exec('home.home_tutorial_ui.popup', $content,$sel_options,array(),array(),array(),2);
+	}
+	
+	/**
+	 * Ajax function to retrive selected app's tutorials based on prefered user lang
+	 *
+	 * @param type $_app application name
+	 */
+	function ajax_getAppsTutorials($_app)
+	{
+		$tutorials = json_decode(self::getJsonData(), true);
+		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
+		$response = egw_json_response::get();
+		$response->data($tutorials[$_app][$lang]);
 	}
 	
 	/**
diff --git a/home/js/app.js b/home/js/app.js
index a4630292be..74a89c5934 100644
--- a/home/js/app.js
+++ b/home/js/app.js
@@ -746,6 +746,46 @@ app.classes.home = AppJS.extend(
 		nm.div.toggleClass('header_hidden');
 		nm.set_hide_header(nm.div.hasClass('header_hidden'));
 		nm.resize();
+	},
+	
+	/**
+	 * Function to set apps and tutorials selectboxes values
+	 * 
+	 * @param {type} egw
+	 * @param {type} widget apps selectbox widget
+	 */
+	tutorial_appChange: function (egw, widget) {
+		var tutorials = etemplate2.getByApplication('home')[0].widgetContainer.getWidgetById('tutorials');
+		var sel_options = {};
+		if (widget)
+		{
+			this.egw.json('home.home_tutorial_ui.ajax_getAppsTutorials', [widget.get_value()], function(_data){
+				if(_data && tutorials)
+				{
+					for (var i=0;i<_data.length;i++)
+					{
+						sel_options[i] = {label:_data[i].title, value:_data[i].src};
+					}
+					tutorials.set_select_options(sel_options);
+				}
+			}).sendRequest();
+		}
+	},
+	
+	/**
+	 * Function to set video iframe base on selected tutorial from
+	 * tutorials selectbox
+	 * 
+	 * @param {type} egw
+	 * @param {type} widget tutorials selectbox
+	 */
+	tutorial_tutorialsChange: function (egw, widget)
+	{
+		var frame = etemplate2.getByApplication('home')[0].widgetContainer.getWidgetById('src');
+		if (frame)
+		{
+			frame.set_value(widget.get_value());
+		}
 	}
 });
 
diff --git a/home/templates/default/tutorial.xet b/home/templates/default/tutorial.xet
index 6d2e3c04ae..8cfbbf2352 100644
--- a/home/templates/default/tutorial.xet
+++ b/home/templates/default/tutorial.xet
@@ -7,7 +7,15 @@
 			<iframe id="src" height="100%" width="100%" seamless="true" fullscreen="true"/>
 		</hbox>
 		<hbox class="dialogFooterToolbar">
-			<button align="left" statustext="Close this window" label="Close" id="button[close]" onclick="window.close()" image="close" background_image="1"/>
+			<button  align="left" statustext="Close this window" label="Close" id="button[close]" onclick="window.close()" image="close" background_image="1"/>
+			<hbox>
+				<menulist>
+					<menupopup id="apps" label="Applications" statustext="Please select application name" options="Please select" onchange="app.home.tutorial_appChange"/>
+				</menulist>
+				<menulist>
+					<menupopup id="tutorials" label="Tutorilas" statustext="Please select a tutorial" options="Please select" onchange="app.home.tutorial_tutorialsChange"/>
+				</menulist>
+			</hbox>
 		</hbox>				
 	</template>
 </overlay>

From 0e7a5338f0c426f97b93c2f7b3776aeece58b918 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 7 Oct 2015 16:45:23 +0000
Subject: [PATCH 101/130] Reduce integration data sent each time, we can use
 the link registry already on the client.

---
 calendar/inc/class.calendar_uilist.inc.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index 1674d251cc..832ae627f6 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -447,12 +447,6 @@ class calendar_uilist extends calendar_ui
 				if (!isset($js_integration_data[$app]))
 				{
 					$js_integration_data[$app] = calendar_bo::integration_get_data($app,'edit_link');
-					if (!is_array($js_integration_data[$app]) || !isset($js_integration_data[$app]['edit']))
-					{
-						$js_integration_data[$app]['edit'] = egw_link::get_registry($app, 'edit');
-						$js_integration_data[$app]['edit_id'] = egw_link::get_registry($app, 'edit_id');
-						$js_integration_data[$app]['edit_popup'] = egw_link::get_registry($app, 'edit_popup');
-					}
 				}
 			}
 			elseif ($event['recur_type'] != MCAL_RECUR_NONE)

From 51b60c5df6ddea8d588da7c5f160e1aadf56a1dd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 7 Oct 2015 19:33:22 +0000
Subject: [PATCH 102/130] no longer store ADOdb object in session, also ensures
 reevaluating environment-data or multiple hosts in connection-data

---
 phpgwapi/inc/class.egw_db.inc.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 367a87d802..5916f439e3 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -584,6 +584,24 @@ class egw_db
 		$this->connect();	// we need to re-connect
 	}
 
+	/**
+	 * Magic method called when object get's serialized
+	 *
+	 * We do NOT store Link_ID and private_Link_ID, as we need to reconnect anyway.
+	 * This also ensures reevaluating environment-data or multiple hosts in connection-data!
+	 *
+	 * @return array
+	 */
+	function __sleep()
+	{
+		if (!empty($this->setupType)) $this->Type = $this->setupType;	// restore Type eg. to mysqli
+
+		$vars = get_object_vars($this);
+		unset($vars['Link_ID']);
+		unset($vars['privat_Link_ID']);
+		return array_keys($vars);
+	}
+
 	/**
 	 * changes defaults set in class-var $capabilities depending on db-type and -version
 	 *
@@ -639,7 +657,7 @@ class egw_db
 		unset($this->Link_ID);
 		$this->Link_ID = 0;
 
-		if (!empty($this->setupType)) $this->type = $this->setupType;
+		if (!empty($this->setupType)) $this->Type = $this->setupType;
 	}
 
 	/**

From 7b0ba9fb9512d24161121adb1cb84e6531c1f53d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 8 Oct 2015 19:57:29 +0000
Subject: [PATCH 103/130] adding a "None" to resource selection in calendar, to
 allow to remove all resources from view

---
 resources/inc/class.resources_ui.inc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/inc/class.resources_ui.inc.php b/resources/inc/class.resources_ui.inc.php
index 07905a1d2e..bf912859c2 100755
--- a/resources/inc/class.resources_ui.inc.php
+++ b/resources/inc/class.resources_ui.inc.php
@@ -509,7 +509,7 @@ class resources_ui
 		// Set original size picture
 		$content['picture_original'] = $content['picture_src'] == 'own_src'?
 				'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg': $this->bo->get_picture($content['res_id'],true);
-		
+
 		$content['quantity'] = $content['quantity'] ? $content['quantity'] : 1;
 		$content['useable'] = $content['useable'] ? $content['useable'] : 1;
 		$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;
@@ -647,10 +647,10 @@ class resources_ui
 			$selectbox = html::select(
 				'owner',
 				$selected,
-				array_merge($resources,$res_cats),
-				$no_lang=true,
-				$options=' style="width: 100%;" id="uical_select_resource"',
-				$multiple=4,
+				$options=array_merge(array('r0' => lang('None')),$resources,$res_cats),
+				true,	// no lang
+				' style="width: 100%;" id="uical_select_resource"',
+				min(4, count($options)),	// multiple
 				false
 			);
 			return array(

From 781f12826541463a1af0fb18c701bcc42cd3ada6 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 9 Oct 2015 07:31:35 +0000
Subject: [PATCH 104/130] WIP EGroupware Tutorial: - Add autoload tutorial to
 Home app

---
 home/inc/class.home_tutorial_ui.inc.php | 25 +++++++++++++++----
 home/js/app.js                          | 33 ++++++++++++++++++++++++-
 home/templates/default/tutorial.xet     |  7 ++++--
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/home/inc/class.home_tutorial_ui.inc.php b/home/inc/class.home_tutorial_ui.inc.php
index 86dacc5a0e..9de291e660 100644
--- a/home/inc/class.home_tutorial_ui.inc.php
+++ b/home/inc/class.home_tutorial_ui.inc.php
@@ -41,15 +41,30 @@ class home_tutorial_ui {
 			$apps = array();
 			foreach ($tutorials as $app => $val)
 			{
-				$apps [$app] = $app;
+				// show only apps user has access to them
+				if (in_array($app, array_keys($GLOBALS['egw_info']['user']['apps']))) $apps [$app] = $app;
 			}
 			$sel_options = array(
 				'apps' => $apps,
 			);
-			$content = array (
-				'src' => $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]['src'],
-				'title' => $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]['title'],
-			);
+			// Check if the user has right to see the app's tutorial
+			if (in_array($tuid_indx[0], array_keys($GLOBALS['egw_info']['user']['apps'])))
+			{
+				$content = array (
+					'src' => $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]['src'],
+					'title' => $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]['title'],
+				);
+			}
+			else
+			{
+				$content = array();
+				egw_framework::message(lang('You do not have permission to see this tutorial!'));
+			}
+			// If its the autoloading tutorial
+			if ($tuid_indx[3] === 'a')
+			{
+				$content ['discardbox'] = true;
+			}
 		}
 				
 		$tmpl->exec('home.home_tutorial_ui.popup', $content,$sel_options,array(),array(),array(),2);
diff --git a/home/js/app.js b/home/js/app.js
index 74a89c5934..1ae16e9eb1 100644
--- a/home/js/app.js
+++ b/home/js/app.js
@@ -98,7 +98,9 @@ app.classes.home = AppJS.extend(
 		{
 			// call parent
 			this._super.apply(this, arguments);
-
+			
+			this.tutorial_autoload_popup();
+			
 			this.et2.set_id('home.index');
 			this.et2.set_actions(this.et2.getArrayMgr('modifications').getEntry('home.index')['actions']);
 
@@ -786,6 +788,35 @@ app.classes.home = AppJS.extend(
 		{
 			frame.set_value(widget.get_value());
 		}
+	},
+	
+	/**
+	 * Open tutorial popup with a general video about egroupware
+	 * the popup can be discarded for the next time show if user
+	 * check the discard checkbox
+	 */
+	tutorial_autoload_popup:function()
+	{
+		var discarded = this.egw.preference('egw_tutorial_autoload', 'home');
+		if (!discarded)
+		{
+			this.egwTutorialPopup('home-'+this.egw.preference('lang')+'-0-a');
+		}
+	},
+	
+	/**
+	 * Function calls on discard checkbox and will set
+	 * the egw_tutorial_autoload preference
+	 * 
+	 * @param {type} egw
+	 * @param {type} widget
+	 */
+	tutorial_autoloadDiscard: function (egw, widget)
+	{
+		if (widget)
+		{
+			this.egw.set_preference('home', 'egw_tutorial_autoload', widget.get_value());
+		}
 	}
 });
 
diff --git a/home/templates/default/tutorial.xet b/home/templates/default/tutorial.xet
index 8cfbbf2352..d9136bc683 100644
--- a/home/templates/default/tutorial.xet
+++ b/home/templates/default/tutorial.xet
@@ -8,7 +8,7 @@
 		</hbox>
 		<hbox class="dialogFooterToolbar">
 			<button  align="left" statustext="Close this window" label="Close" id="button[close]" onclick="window.close()" image="close" background_image="1"/>
-			<hbox>
+			<hbox disabled="@discardbox">
 				<menulist>
 					<menupopup id="apps" label="Applications" statustext="Please select application name" options="Please select" onchange="app.home.tutorial_appChange"/>
 				</menulist>
@@ -16,6 +16,9 @@
 					<menupopup id="tutorials" label="Tutorilas" statustext="Please select a tutorial" options="Please select" onchange="app.home.tutorial_tutorialsChange"/>
 				</menulist>
 			</hbox>
-		</hbox>				
+			<hbox disabled="!@discardbox" class="discard_checkbox">
+				<checkbox id="checkbox" label="Do not show this video next time" onchange="app.home.tutorial_autoloadDiscard"/>
+			</hbox>
+		</hbox>
 	</template>
 </overlay>

From 52a3e2240cacaebb4e85a37a4a96268cf17daa6b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 9 Oct 2015 07:42:13 +0000
Subject: [PATCH 105/130] WIP EGroupware Tutorial: - Add disable option in
 admin site configuration in order to be able to switch off the tutorials menu
 in sideboxes

---
 admin/templates/default/config.tpl | 12 +++++++++++-
 phpgwapi/inc/class.hooks.inc.php   | 23 +++++++++++++----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl
index 75877b260c..2a16bca796 100644
--- a/admin/templates/default/config.tpl
+++ b/admin/templates/default/config.tpl
@@ -100,7 +100,17 @@
      </select>
     </td>
    </tr>
-
+   
+   <tr class="row_off">
+    <td>{lang_Disable_EGroupware_Tutorial_in_sidebox_menu}:</td>
+    <td>
+     <select name="newsettings[egw_tutorial_disable]">
+      <option value="">{lang_No}</option>
+      <option value="True">{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+   
    <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_security}</b></td>
    </tr>
diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index 018ea16067..d74f7d571e 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -387,15 +387,18 @@ class hooks
 	 */
 	public static function egw_tutorial_menu($appname)
 	{
-		$file = Array (
-			array(
-				'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
-				'no_lang' => true,
-				'link'    => false,
-				'icon'    => false,
-			),
-			'menuOpened'  => true
-		);
-		display_sidebox($appname, lang('EGroupware Tutorial'), $file);
+		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable'])
+		{
+			$file = Array (
+				array(
+					'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
+					'no_lang' => true,
+					'link'    => false,
+					'icon'    => false,
+				),
+				'menuOpened'  => true
+			);
+			display_sidebox($appname, lang('EGroupware Tutorial'), $file);
+		}
 	}
 }

From a378d19d2ac09485c537328642731c033a5fe87f Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 9 Oct 2015 11:46:45 +0000
Subject: [PATCH 106/130] Some fixes for custom app-theme css: - Make sure
 including css on ajax response respect app-theme - Include app-theme for home
 portlets

---
 calendar/inc/class.calendar_favorite_portlet.inc.php | 4 +++-
 home/inc/class.home_favorite_portlet.inc.php         | 3 ++-
 home/inc/class.home_link_portlet.inc.php             | 3 ++-
 phpgwapi/inc/class.egw_framework.inc.php             | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_favorite_portlet.inc.php b/calendar/inc/class.calendar_favorite_portlet.inc.php
index 1962822713..5fdabfdad2 100644
--- a/calendar/inc/class.calendar_favorite_portlet.inc.php
+++ b/calendar/inc/class.calendar_favorite_portlet.inc.php
@@ -59,7 +59,9 @@ class calendar_favorite_portlet extends home_favorite_portlet
 	{
 
 		// Always load app's css
-		egw_framework::includeCSS('calendar','app');
+		egw_framework::includeCSS('calendar', 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
+			egw_framework::includeCSS('calendar','app');
+		
 		if($this->favorite['state']['view'] == 'listview' || is_array($this->favorite) && !$this->favorite['state']['view'])
 		{
 			$ui = new calendar_uilist();
diff --git a/home/inc/class.home_favorite_portlet.inc.php b/home/inc/class.home_favorite_portlet.inc.php
index 73d7d3e894..76d721e2aa 100644
--- a/home/inc/class.home_favorite_portlet.inc.php
+++ b/home/inc/class.home_favorite_portlet.inc.php
@@ -121,7 +121,8 @@ class home_favorite_portlet extends home_portlet
 
 
 		// Always load app's css
-		egw_framework::includeCSS($this->context['appname'],'app');
+		egw_framework::includeCSS($this->context['appname'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
+			egw_framework::includeCSS($this->context['appname'],'app');
 
 		// Always load app's javascript, so most actions have a chance of working
 		egw_framework::validate_file('','app',$this->context['appname']);
diff --git a/home/inc/class.home_link_portlet.inc.php b/home/inc/class.home_link_portlet.inc.php
index 42cf9fc1c0..94491cc4c5 100644
--- a/home/inc/class.home_link_portlet.inc.php
+++ b/home/inc/class.home_link_portlet.inc.php
@@ -117,7 +117,8 @@ class home_link_portlet extends home_portlet
 		{
 
 			// Always load app's css
-			egw_framework::includeCSS($this->context['entry']['app'],'app');
+			egw_framework::includeCSS($this->context['entry']['app'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
+				egw_framework::includeCSS($this->context['entry']['app'],'app');
 			
 			try
 			{
diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 2e9c40a5d3..a46d3d7f2c 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -2276,7 +2276,8 @@ abstract class egw_framework
 		$app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// try to add app specific css file
-		self::includeCSS($app,'app');
+		self::includeCSS($app, 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
+			self::includeCSS($app,'app');
 
 		// add all css files from egw_framework::includeCSS()
 		$query = null;

From 5a08713cbc32397776bcfa8c755dabf7b06a4f5e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 9 Oct 2015 12:40:26 +0000
Subject: [PATCH 107/130] * eTemplate: setting higher request timeout of 4
 hours (was 2 hours)

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

diff --git a/etemplate/inc/class.etemplate_request_cache.inc.php b/etemplate/inc/class.etemplate_request_cache.inc.php
index 10f57c2378..496158965a 100644
--- a/etemplate/inc/class.etemplate_request_cache.inc.php
+++ b/etemplate/inc/class.etemplate_request_cache.inc.php
@@ -53,7 +53,7 @@ class etemplate_request_cache extends etemplate_request
 	/**
 	 * Expiration time of 4 hours
 	 */
-	const EXPIRATION = 7200;
+	const EXPIRATION = 14400;
 
 	/**
 	 * request id

From 61db4b755944828f7e82e20ab37d60886f82ed28 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 9 Oct 2015 15:09:34 +0000
Subject: [PATCH 108/130] WIP EGroupware tutorial: - Open autoload introduction
 tutorial from all apps - Provide fallback tutorial

---
 home/inc/class.home_tutorial_ui.inc.php | 20 ++++++++++++--------
 home/js/app.js                          | 18 +-----------------
 home/templates/default/tutorial.xet     |  4 ++--
 phpgwapi/js/framework/fw_browser.js     |  8 ++++++++
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/home/inc/class.home_tutorial_ui.inc.php b/home/inc/class.home_tutorial_ui.inc.php
index 9de291e660..fb16226a87 100644
--- a/home/inc/class.home_tutorial_ui.inc.php
+++ b/home/inc/class.home_tutorial_ui.inc.php
@@ -25,7 +25,7 @@ class home_tutorial_ui {
 	 * Popup window to display youtube video
 	 * @param type $content
 	 */
-	function popup ($content)
+	function popup ($content=null)
 	{
 		//Allow youtube frame to pass the CSP check
 		egw_framework::csp_frame_src_attrs(array('www.youtube.com'));
@@ -38,7 +38,7 @@ class home_tutorial_ui {
 		{
 			// read tutorials json file to fetch data
 			$tutorials = json_decode(self::getJsonData(), true);
-			$apps = array();
+			$apps = array('introduction' => lang('Introduction'));
 			foreach ($tutorials as $app => $val)
 			{
 				// show only apps user has access to them
@@ -48,11 +48,15 @@ class home_tutorial_ui {
 				'apps' => $apps,
 			);
 			// Check if the user has right to see the app's tutorial
-			if (in_array($tuid_indx[0], array_keys($GLOBALS['egw_info']['user']['apps'])))
+			if (in_array($tuid_indx[0], array_keys($GLOBALS['egw_info']['user']['apps'])) || $tuid_indx[0] === "introduction")
 			{
+				// fallback to english video
+				$tutorial = $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]? $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]:
+					$tutorials[$tuid_indx[0]]['en'][$tuid_indx[2]];
+				
 				$content = array (
-					'src' => $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]['src'],
-					'title' => $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]['title'],
+					'src' => $tutorial['src'],
+					'title' => $tutorial['title']
 				);
 			}
 			else
@@ -80,7 +84,7 @@ class home_tutorial_ui {
 		$tutorials = json_decode(self::getJsonData(), true);
 		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		$response = egw_json_response::get();
-		$response->data($tutorials[$_app][$lang]);
+		$response->data($tutorials[$_app][$lang]?$tutorials[$_app][$lang]:$tutorials[$_app]['en']);
 	}
 	
 	/**
@@ -103,8 +107,8 @@ class home_tutorial_ui {
 		if (!($json = egw_cache::getCache(egw_cache::TREE, 'home', 'egw_tutorial_json')))
 		{
 			$json = file_get_contents('http://www.egroupware.de/videos/tutorials.json');
-			// Cache the json object for one month
-			egw_cache::addCache(egw_cache::TREE, 'home', 'egw_tutorial_json', $json, 3600 * 720);
+			// Cache the json object for two hours
+			egw_cache::setCache(egw_cache::TREE, 'home', 'egw_tutorial_json', $json, 720);
 		}
 		
 		return $json;
diff --git a/home/js/app.js b/home/js/app.js
index 1ae16e9eb1..ef11669748 100644
--- a/home/js/app.js
+++ b/home/js/app.js
@@ -99,8 +99,6 @@ app.classes.home = AppJS.extend(
 			// call parent
 			this._super.apply(this, arguments);
 			
-			this.tutorial_autoload_popup();
-			
 			this.et2.set_id('home.index');
 			this.et2.set_actions(this.et2.getArrayMgr('modifications').getEntry('home.index')['actions']);
 
@@ -790,20 +788,6 @@ app.classes.home = AppJS.extend(
 		}
 	},
 	
-	/**
-	 * Open tutorial popup with a general video about egroupware
-	 * the popup can be discarded for the next time show if user
-	 * check the discard checkbox
-	 */
-	tutorial_autoload_popup:function()
-	{
-		var discarded = this.egw.preference('egw_tutorial_autoload', 'home');
-		if (!discarded)
-		{
-			this.egwTutorialPopup('home-'+this.egw.preference('lang')+'-0-a');
-		}
-	},
-	
 	/**
 	 * Function calls on discard checkbox and will set
 	 * the egw_tutorial_autoload preference
@@ -815,7 +799,7 @@ app.classes.home = AppJS.extend(
 	{
 		if (widget)
 		{
-			this.egw.set_preference('home', 'egw_tutorial_autoload', widget.get_value());
+			this.egw.set_preference('common', 'egw_tutorial_autoload', widget.get_value());
 		}
 	}
 });
diff --git a/home/templates/default/tutorial.xet b/home/templates/default/tutorial.xet
index d9136bc683..9c3217ff9c 100644
--- a/home/templates/default/tutorial.xet
+++ b/home/templates/default/tutorial.xet
@@ -10,10 +10,10 @@
 			<button  align="left" statustext="Close this window" label="Close" id="button[close]" onclick="window.close()" image="close" background_image="1"/>
 			<hbox disabled="@discardbox">
 				<menulist>
-					<menupopup id="apps" label="Applications" statustext="Please select application name" options="Please select" onchange="app.home.tutorial_appChange"/>
+					<menupopup id="apps" label="Applications" statustext="Please select application name" onchange="app.home.tutorial_appChange"/>
 				</menulist>
 				<menulist>
-					<menupopup id="tutorials" label="Tutorilas" statustext="Please select a tutorial" options="Please select" onchange="app.home.tutorial_tutorialsChange"/>
+					<menupopup id="tutorials" label="Tutorilas" statustext="Please select a tutorial" onchange="app.home.tutorial_tutorialsChange"/>
 				</menulist>
 			</hbox>
 			<hbox disabled="!@discardbox" class="discard_checkbox">
diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js
index d4faab33c8..86eb520405 100644
--- a/phpgwapi/js/framework/fw_browser.js
+++ b/phpgwapi/js/framework/fw_browser.js
@@ -172,6 +172,14 @@ var fw_browser =  Class.extend({
 				// Remove escape timeout
 				clearTimeout(self.ajaxLoaderDivTimeout);
 			}
+			
+			// Open tutorial popup with an introduction video about egroupware
+			// the popup can be discarded for the next time show if user
+			// check the discard checkbox
+			if (!egw.preference('egw_tutorial_autoload', 'common'))
+			{
+				egw.open_link(egw.link('/index.php', 'menuaction=home.home_tutorial_ui.popup&tuid=introduction-'+egw.preference('lang')+'-0-a'),'_blank','750x580');
+			}
 		});
 
 		// Check whether the given url is a pseudo url which should be executed

From 0bdbccf1b4017e0702bb7c9584c1d15d842f4acc Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 9 Oct 2015 16:33:34 +0000
Subject: [PATCH 109/130] Make sure categories with no color do not turn the
 event transparent.

---
 calendar/js/et2_widget_event.js    | 16 +++++++++++-----
 calendar/templates/default/app.css |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index 0cac28c955..9659bb88ea 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -206,7 +206,6 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
 		{
 			this.div.addClass('cat_' + event.category);
 		}
-		this.div.css('border-color', this.div.css('background-color'));
 
 		this.div.toggleClass('calendar_calEventUnknown', event.participants[egw.user('account_id')] ? event.participants[egw.user('account_id')][0] === 'U' : false);
 		this.div.addClass(this._status_class());
@@ -224,10 +223,17 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
 		}
 
 		this.div.attr('data-title', title);
-		this.title.text(small_height ? title : this._get_timespan(event))
-			// Set title color based on background brightness
-			.css('background-color', this.div.css('background-color'))
-			.css('color', jQuery.Color(this.div.css('background-color')).lightness() > 0.5 ? 'black':'white');
+		this.title.text(small_height ? title : this._get_timespan(event));
+
+		// Colors - don't make them transparent if there is no color
+		if(jQuery.Color("rgba(0,0,0,0)").toRgbaString() != jQuery.Color(this.div,'background-color').toRgbaString())
+		{
+			this.div.css('border-color', this.div.css('background-color'));
+				// Set title color based on background brightness
+			this.title
+				.css('background-color', this.div.css('background-color'))
+				.css('color', jQuery.Color(this.div.css('background-color')).lightness() > 0.5 ? 'black':'white');
+		}
 
 		this.icons.appendTo(this.title)
 			.html(this._icons());
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index c54019d79c..e4773a1fcf 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -356,6 +356,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
  *  background: depending on category (shade)
  *
  */
+	border-color: #808080;
 }
 .calendar_calEvent:not([class*="cat_"]) {
 	/* Defaults for no category, so we don't override it */

From 5f109d2d9efe68839dad5d79bb1bbc5b2dda9811 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 9 Oct 2015 17:37:01 +0000
Subject: [PATCH 110/130] * Calendar/CalDAV: fixed event not show if user only
 participates in an exeception (not the master) and has no read-rights for any
 master participant

---
 calendar/inc/class.calendar_bo.inc.php       | 14 ++++++--
 calendar/inc/class.calendar_groupdav.inc.php | 38 +++++++++++---------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index b2cf922055..8e23eec953 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -680,11 +680,11 @@ class calendar_bo
 			'id'    => $event['id'],
 			'start' => $event['start'],
 			'end'   => $event['end'],
+			'whole_day' => $event['whole_day'],
 			'tzid'  => $event['tzid'],
 			'title' => lang('private'),
 			'modified'	=> $event['modified'],
 			'owner'		=> $event['owner'],
-			'recur_type' => MCAL_RECUR_NONE,
 			'uid'	=> $event['uid'],
 			'etag'	=> $event['etag'],
 			'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
@@ -692,7 +692,17 @@ class calendar_bo
 			'category' => $event['category'],	// category is visible anyway, eg. by using planner by cat
 			'non_blocking' => $event['non_blocking'],
 			'caldav_name' => $event['caldav_name'],
-		);
+		// we need full recurrence information, as they are relevant free/busy information
+		)+($event['recur_type'] ? array(
+			'recur_type'     => $event['recur_type'],
+			'recur_interval' => $event['recur_interval'],
+			'recur_data'     => $event['recur_data'],
+			'recur_enddate'  => $event['recur_enddate'],
+			'recur_exception'=> $event['recur_exception'],
+		):array(
+			'reference'      => $event['reference'],
+			'recurrence'     => $event['recurrence'],
+		));
 	}
 
 	/**
diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 7c7959c831..b351bbf66c 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -177,7 +177,7 @@ class calendar_groupdav extends groupdav_handler
 
 		if ($path == '/calendar/')
 		{
-			$filter['filter'] = 'owner';
+			$filter['filter'] = 'default';
 		}
 		// scheduling inbox, shows only not yet accepted or rejected events
 		elseif (substr($path,-7) == '/inbox/')
@@ -647,10 +647,14 @@ class calendar_groupdav extends groupdav_handler
 		);
 		if (is_array($expand)) $params += $expand;
 
-		$events =& $bo->search($params);
+		if (!($events =& $bo->search($params)))
+		{
+			return array();
+		}
 
 		// find master, which is not always first event, eg. when first event is an exception
 		$master = null;
+		$exceptions = array();
 		foreach($events as $k => &$recurrence)
 		{
 			if ($recurrence['recur_type'])
@@ -662,20 +666,18 @@ class calendar_groupdav extends groupdav_handler
 			}
 		}
 		// if recurring event starts in future behind horizont, nothing will be returned by bo::search()
-		if (!isset($master) && !($master = $bo->read($uid)))
-		{
-			return array();
-		}
+		if (!isset($master)) $master = $bo->read($uid);
+
 		foreach($events as $k => &$recurrence)
 		{
 			//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence));
-			if ($recurrence['id'] != $master['id'])	// real exception
+			if (!$master || $recurrence['id'] != $master['id'])	// real exception
 			{
 				// user is NOT participating in this exception
 				if ($user && !self::isParticipant($recurrence, $user))
 				{
 					// if he is NOT in master, delete this exception
-					if (!self::isParticipant($master, $user))
+					if (!$master || !self::isParticipant($master, $user))
 					{
 						unset($events[$k]);
 						continue;
@@ -695,14 +697,16 @@ class calendar_groupdav extends groupdav_handler
 				continue;	// nothing to change
 			}
 			// alarms are reported on recurrences --> move them to master
-			foreach($recurrence['alarm'] as $alarm)
+			if ($master)
 			{
-				$master['alarm'][] = $alarm;
+				foreach($recurrence['alarm'] as $alarm)
+				{
+					$master['alarm'][] = $alarm;
+				}
+				$recurrence['alarm'] = array();
 			}
-			$recurrence['alarm'] = array();
-
 			// now we need to check if this recurrence is an exception
-			if (!$expand && $master['participants'] == $recurrence['participants'])
+			if (!$expand && $master && $master['participants'] == $recurrence['participants'])
 			{
 				//error_log('NO exception: '.array2string($recurrence));
 				unset($events[$k]);	// no exception --> remove it
@@ -711,12 +715,12 @@ class calendar_groupdav extends groupdav_handler
 			// this is a virtual exception now (no extra event/cal_id in DB)
 			//error_log('virtual exception: '.array2string($recurrence));
 			$recurrence['recurrence'] = $recurrence['start'];
-			$recurrence['reference'] = $master['id'];
+			if ($master) $recurrence['reference'] = $master['id'];
 			$recurrence['recur_type'] = MCAL_RECUR_NONE;	// is set, as this is a copy of the master
 			// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
 		}
 		// only add master if we are not expanding and current user participates in master (and not just some exceptions)
-		if (!$expand && (!$user || self::isParticipant($master, $user)))
+		if (!$expand && $master && (!$user || self::isParticipant($master, $user)))
 		{
 			$events = array_merge(array($master), $events);
 		}
@@ -1315,7 +1319,9 @@ class calendar_groupdav extends groupdav_handler
 		$event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL', 'cal_reference=0'), null, true, 'server');
 		if ($event) $event = array_shift($event);	// read with array as 1. param, returns an array of events!
 
-		if (!($retval = $this->bo->check_perms(EGW_ACL_FREEBUSY,$event, 0, 'server')))
+		if (!($retval = $this->bo->check_perms(EGW_ACL_FREEBUSY,$event, 0, 'server')) &&
+			// above can be true, if current user is not in master but just a recurrence
+			(!$event['recur_type'] || !($events = self::get_series($event['uid'], $this->bo))))
 		{
 			if ($this->debug > 0) error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval));
 			return $retval;

From a1cc41d0ae1bc01ffcb333f5af7823fc18c426e0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 9 Oct 2015 17:47:10 +0000
Subject: [PATCH 111/130] revert changing filter for /calendar from owner to
 default, as /calendar is no CalDAV location anyway because outside of
 calendar home

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

diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index b351bbf66c..a4db000e09 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -177,7 +177,7 @@ class calendar_groupdav extends groupdav_handler
 
 		if ($path == '/calendar/')
 		{
-			$filter['filter'] = 'default';
+			$filter['filter'] = 'owner';
 		}
 		// scheduling inbox, shows only not yet accepted or rejected events
 		elseif (substr($path,-7) == '/inbox/')

From 328664237448a013325425e703f4ddbc7996aca6 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 9 Oct 2015 19:48:28 +0000
Subject: [PATCH 112/130] Fix merge from listview, and handle merging from
 listview into a template designed for the other views (range tag, no
 pagerepeat)

---
 calendar/inc/class.calendar_merge.inc.php   | 47 ++++++++++++++++++++-
 calendar/inc/class.calendar_ui.inc.php      | 12 +++++-
 calendar/inc/class.calendar_uilist.inc.php  |  1 +
 calendar/inc/class.calendar_uiviews.inc.php |  6 +++
 calendar/js/app.js                          |  4 ++
 calendar/templates/default/sidebox.xet      |  2 +-
 6 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php
index 26f84df664..2799a17600 100644
--- a/calendar/inc/class.calendar_merge.inc.php
+++ b/calendar/inc/class.calendar_merge.inc.php
@@ -92,11 +92,53 @@ class calendar_merge extends bo_merge
 		foreach(self::$relative as $day) {
 			$this->table_plugins[$day] = 'day'; // Current day
 		}
-		$this->query = $GLOBALS['egw']->session->appsession('session_data','calendar');
-		$this->query['users'] = explode(',', $this->query['owner']);
+		$this->query = is_array($this->bo->cal_prefs['saved_states']) ?
+			$this->bo->cal_prefs['saved_states'] : unserialize($this->bo->cal_prefs['saved_states']);
+
+		$this->query['users'] = is_array($this->query['owner']) ? $this->query['owner'] : explode(',', $this->query['owner']);
 		$this->query['num_rows'] = -1;
 	}
 
+	/**
+	 * Merges a given document with contact data
+	 *
+	 * Overridden from parent to be able to change a list of events into a range,
+	 * if the target document has no pagerepeat tag.  Otherwise, parent::merge_string()
+	 * would fail because we're trying to merge multiple records with no pagerepeat tag.
+	 *
+	 *
+	 * @param string $content
+	 * @param array $ids array with contact id(s)
+	 * @param string &$err error-message on error
+	 * @param string $mimetype mimetype of complete document, eg. text/*, application/vnd.oasis.opendocument.text, application/rtf
+	 * @param array $fix=null regular expression => replacement pairs eg. to fix garbled placeholders
+	 * @param string $charset=null charset to override default set by mimetype or export charset
+	 * @return string|boolean merged document or false on error
+	 */
+	function merge_string($content,$ids,$err,$mimetype,$fix)
+	{
+		// Handle merging a list of events into a document with range instead of pagerepeat
+		if(strpos($content, '$$pagerepeat') === false && count($ids) > 1)
+		{
+			// Merging more than one something will fail without pagerepeat
+			if (is_array($ids) && $ids[0]['id'])
+			{
+				// Passed an array of events, to be handled like a date range
+				$events = $ids;
+				$ids = array('start' => PHP_INT_MAX, 'end' => 0);
+				$this->ids = array();
+				foreach($events as $event) {
+					if($event['start'] && egw_time::to($event['start'],'ts') < $ids['start']) $ids['start'] = egw_time::to($event['start'],'ts');
+					if($event['end'] && egw_time::to($event['end'],'ts') > $ids['end']) $ids['end'] = egw_time::to($event['end'],'ts');
+					// Keep ids for future use
+					$this->ids[] = $event['id'];
+				}
+				$ids = array($ids);
+			}
+		}
+		return parent::merge_string($content, $ids, $err, $mimetype,$fix);
+	}
+
 	/**
 	 * Get replacements
 	 *
@@ -133,6 +175,7 @@ class calendar_merge extends bo_merge
 				// Keep ids for future use
 				$this->ids[]  = $event['id'];
 			}
+			$id = array($id);
 		}
 		else
 		{
diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 28f1330657..9e72775454 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -852,8 +852,16 @@ class calendar_ui
 				));
 			}
 			$merge = new calendar_merge();
-			return $merge->download($_GET['merge'], $timespan, '', $GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']);
+			$error = $merge->download($_GET['merge'], $timespan, '', $GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']);
+			// Here?  Doesn't actually give the message
+			egw_framework::refresh_opener($error, 'calendar');
 		}
-		return false;
+		unset($_GET['merge']);
+
+		// This doesn't give message either, but at least it doesn't give a blank screen
+		egw_framework::redirect_link('/index.php', array(
+			'msg' => $error,
+			'cd' => 'yes'
+		));
 	}
 }
diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index 832ae627f6..90b123aee4 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -590,6 +590,7 @@ class calendar_uilist extends calendar_ui
 				$document_merge = new calendar_merge();
 				$msg = $document_merge->download($settings, $checked, '', $GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']);
 				$failed = count($checked);
+				error_log($msg);
 				return false;
 		}
 
diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index e45e9eb58c..ffec0e0375 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -162,6 +162,12 @@ class calendar_uiviews extends calendar_ui
 			// for a single owner we add it's name to the app-header
 			(count(explode(',',$this->owner)) == 1 ? ': '.$this->bo->participant_name($this->owner) : '');
 
+		// Check for GET message (from merge)
+		if($_GET['msg'])
+		{
+			egw_framework::message($_GET['msg']);
+			unset($_GET['msg']);
+		}
 		// standard params for calling bocal::search for all views
 		$this->owner = str_replace('%2C',',',$this->owner);
 		$this->search_params = array(
diff --git a/calendar/js/app.js b/calendar/js/app.js
index c511152508..0fa4785878 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -1641,6 +1641,10 @@ app.classes.calendar = AppJS.extend(
 
 				var nm = view.etemplates[0].widgetContainer.getWidgetById('nm');
 				nm.applyFilters(state.state);
+				if(!state.state.end_date && nm.activeFilters.enddate)
+				{
+					this.state.last = nm.activeFilters.enddate;
+				}
 			}
 
 			/* Update re-orderable calendars */
diff --git a/calendar/templates/default/sidebox.xet b/calendar/templates/default/sidebox.xet
index dcdde277a5..cfbe98ba87 100644
--- a/calendar/templates/default/sidebox.xet
+++ b/calendar/templates/default/sidebox.xet
@@ -53,7 +53,7 @@ if(view_change >= 0) {update.view = app.calendar.sidebox_changes_views[view_chan
 			<taglist id="owner" class="et2_fullWidth" onchange="app.calendar.update_state({owner: widget.getValue()});" autocomplete_params=''/>
 			-->
 			<select id="filter" no_lang="true" class="et2_fullWidth" onchange="app.calendar.update_state({filter: widget.getValue()});"/>
-			<select id="merge" empty_label="Insert in document" onchange="if(widget.getValue()) {widget.getInstanceManager().postSubmit();}window.setTimeout(function() {widget.set_value('');},100);return false;" class="et2_fullWidth"/>/>
+			<select id="merge" empty_label="Insert in document" onchange="if(widget.getValue()) {widget.getRoot().getWidgetById('first').set_value(app.calendar.state.first);widget.getRoot().getWidgetById('last').set_value(app.calendar.state.last); widget.getInstanceManager().postSubmit();} window.setTimeout(function() {widget.set_value('');},100);return false;" class="et2_fullWidth"/>/>
 		</vbox>
 		<iframe id="iframe" width="100%" height="100%"/>
 	</template>

From 9da4924f0097a40d369d61aa5e6f295518b09097 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 10 Oct 2015 10:33:35 +0000
Subject: [PATCH 113/130] allow to overide egw_server_root used as key in
 egw_cache for tree- AND instance-level

---
 phpgwapi/inc/class.egw_cache.inc.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_cache.inc.php b/phpgwapi/inc/class.egw_cache.inc.php
index bb2526e8ad..9f610f2145 100644
--- a/phpgwapi/inc/class.egw_cache.inc.php
+++ b/phpgwapi/inc/class.egw_cache.inc.php
@@ -89,6 +89,13 @@ class egw_cache
 	 */
 	static $max_expiration;
 
+	/**
+	 * Used to determine keys for tree- and instance-level caches
+	 *
+	 * @var string
+	 */
+	static $egw_server_root = EGW_SERVER_ROOT;
+
 	/**
 	 * Add some data in the cache, only if the key does not yet exist
 	 *
@@ -675,7 +682,7 @@ class egw_cache
 			case self::TREE:
 				if (!isset($tree_key))
 				{
-					$tree_key = $level.'-'.str_replace(array(':','/','\\'),'-',EGW_SERVER_ROOT);
+					$tree_key = $level.'-'.str_replace(array(':','/','\\'),'-', self::$egw_server_root);
 					// add charset to key, if not utf-8 (as everything we store depends on charset!)
 					if (($charset = self::get_system_config('system_charset',false)) && $charset != 'utf-8')
 					{

From de4098e5504a3f0dc4a5bced7803a5b6018343a4 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 12 Oct 2015 09:55:13 +0000
Subject: [PATCH 114/130] Make sure we are not requesting server for an empty
 value option or other widgets but select-timezone as server won't find
 anything and it will fall into an infinitive loop, e.g. select-cat widget.

---
 etemplate/js/et2_widget_selectbox.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js
index 1d1827c35b..a98060b9f1 100644
--- a/etemplate/js/et2_widget_selectbox.js
+++ b/etemplate/js/et2_widget_selectbox.js
@@ -1131,9 +1131,10 @@ jQuery.extend(et2_selectbox,
 		else
 		{
 			// Check that the value is in there
-			// Make sure we are not requesting server for an empty value option
-			// as server won't find anything and it will fall into an infinitive loop
-			if(attrs.value && attrs.value != "" && attrs.value != "0")
+			// Make sure we are not requesting server for an empty value option or 
+			// other widgets but select-timezone as server won't find anything and
+			// it will fall into an infinitive loop, e.g. select-cat widget.
+			if(attrs.value && attrs.value != "" && attrs.value != "0" && attrs.type == "select-timezone")
 			{
 				var missing_option = true;
 				for(var i = 0; i < cache.length && missing_option; i++)

From 8643b08e905ffbb5a1649a2eed019b06edbd2f79 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 12 Oct 2015 11:55:20 +0000
Subject: [PATCH 115/130] * CalDAV: could not set own status for participation
 in an exception, if not being a participant of master

---
 calendar/inc/class.calendar_bo.inc.php       | 1 -
 calendar/inc/class.calendar_groupdav.inc.php | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 8e23eec953..f2111ae473 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -2059,7 +2059,6 @@ class calendar_bo
 		if (!is_array($entry))
 		{
 			list($id,$recur_date) = explode(':',$entry);
-			if (!$this->check_perms(EGW_ACL_FREEBUSY, $id, 0, 'server')) return false;
 			$entry = $this->read($id, $recur_date, true, 'server');
 		}
 		$etag = $schedule_tag = $entry['id'].':'.$entry['etag'];
diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index a4db000e09..9327ccec55 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -842,7 +842,9 @@ class calendar_groupdav extends groupdav_handler
 			{
 				$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 				$user_and_memberships[] = $user;
-				if (!array_intersect(array_keys($oldEvent['participants']), $user_and_memberships))
+				if (!array_intersect(array_keys($oldEvent['participants']), $user_and_memberships) &&
+					// above can be true, if current user is not in master but just a recurrence
+					(!$oldEvent['recur_type'] || !($series = self::get_series($oldEvent['uid'], $this->bo))))
 				{
 					if ($this->debug) error_log(__METHOD__."(,,$user) user $user is NOT an attendee!");
 					return '403 Forbidden';
@@ -851,11 +853,10 @@ class calendar_groupdav extends groupdav_handler
 				if (($events = $handler->icaltoegw($vCalendar)))
 				{
 					$modified = 0;
-					$series = null;
 					foreach($events as $n => $event)
 					{
 						// for recurrances of event series, we need to read correct recurrence (or if series master is no first event)
-						if ($event['recurrence'] || $n && !$event['recurrence'])
+						if ($event['recurrence'] || $n && !$event['recurrence'] || isset($series))
 						{
 							// first try reading (virtual and real) exceptions
 							if (!isset($series))
@@ -868,7 +869,7 @@ class calendar_groupdav extends groupdav_handler
 								if ($oldEvent['recurrence'] == $event['recurrence']) break;
 							}
 							// if no exception found, check if it might be just a recurrence (no exception)
-							if ($oldEvent['recurrence'] != $event['recurrence'])
+							if ($event['recurrence'] && $oldEvent['recurrence'] != $event['recurrence'])
 							{
 								if (!($oldEvent = $this->bo->read($eventId, $event['recurrence'], true)) ||
 									// virtual exceptions have recurrence=0 and recur_date=recurrence (series master or real exceptions have recurence=0)

From 19711865978adcee47b161c7b69bb5c732ff2dc5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 12 Oct 2015 13:26:34 +0000
Subject: [PATCH 116/130] special handling for $_POST[json_data] in
 _check_script_tag, to decend into its decoded content, fixing json direct
 might break json syntax

---
 phpgwapi/inc/common_functions.inc.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 9793ead7fc..59d7dc5bdb 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -1464,6 +1464,13 @@ function _check_script_tag(&$var,$name='')
 				static $preg = '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
 				if (preg_match($preg,$val))
 				{
+					// special handling for $_POST[json_data], to decend into it's decoded content, fixing json direct might break json syntax
+					if ($name == '_POST' && $key == 'json_data' && ($json_data = json_decode($val, true)))
+					{
+						_check_script_tag($json_data, $name.'[json_data]');
+						$_REQUEST[$key] = $var[$key] = json_encode($json_data);
+						continue;
+					}
 					error_log(__FUNCTION__."(,$name) ${name}[$key] = ".$var[$key]);
 					$GLOBALS['egw_unset_vars'][$name.'['.$key.']'] = $var[$key];
 					// attempt to clean the thing

From 0285dd94f861b88d3c2dedfd82a49e45da089624 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 12 Oct 2015 14:18:33 +0000
Subject: [PATCH 117/130] allow all valid timezones in server-side validation,
 to allow existing values and in future select arbitrary timezones via an ajax
 callback

---
 etemplate/inc/class.etemplate_widget_menupopup.inc.php | 7 +++++++
 etemplate/lang/egw_de.lang                             | 1 +
 etemplate/lang/egw_en.lang                             | 1 +
 3 files changed, 9 insertions(+)

diff --git a/etemplate/inc/class.etemplate_widget_menupopup.inc.php b/etemplate/inc/class.etemplate_widget_menupopup.inc.php
index 1d82a09d29..d8e1d10aff 100644
--- a/etemplate/inc/class.etemplate_widget_menupopup.inc.php
+++ b/etemplate/inc/class.etemplate_widget_menupopup.inc.php
@@ -162,6 +162,13 @@ class etemplate_widget_menupopup extends etemplate_widget
 						}
 						break;
 
+					case 'select-timezone':
+						if (!calendar_timezones::tz2id($val))
+						{
+							self::set_validation_error($form_name, lang("'%1' is NOT a valid timezone!", $val));
+						}
+						break;
+
 					default:
 						if(!in_array($val, $allowed))
 						{
diff --git a/etemplate/lang/egw_de.lang b/etemplate/lang/egw_de.lang
index 13977227aa..0cf84cedfe 100644
--- a/etemplate/lang/egw_de.lang
+++ b/etemplate/lang/egw_de.lang
@@ -19,6 +19,7 @@
 '%1' is not a valid date !!!	etemplate	de	'%1' ist ein ungültiges Datum !!!
 '%1' is not a valid floatingpoint number !!!	etemplate	de	'%1' ist keine gültige Gleitkommazahl !!!
 '%1' is not a valid integer !!!	etemplate	de	'%1' ist keine gültige Ganzzahl !!!
+'%1' is not a valid timezone!	etemplate	de	'%1' ist keine gültige Zeitzone!
 '%1' is not allowed ('%2')!	etemplate	de	'%1' ist NICHT erlaubt ('%2')!
 '%1' is not allowed%2)!	etemplate	de	'%1' ist NICHT erlaubt '%2'!
 1 minute	etemplate	de	1 Minute
diff --git a/etemplate/lang/egw_en.lang b/etemplate/lang/egw_en.lang
index d06cda524f..cfd5a1ae7f 100644
--- a/etemplate/lang/egw_en.lang
+++ b/etemplate/lang/egw_en.lang
@@ -20,6 +20,7 @@
 '%1' is not a valid date !!!	etemplate	en	'%1' is not a valid date!
 '%1' is not a valid floatingpoint number !!!	etemplate	en	'%1' is not a valid floating point number!
 '%1' is not a valid integer !!!	etemplate	en	'%1' is not a valid integer!
+'%1' is not a valid timezone!	etemplate	en	'%1' is not a valid timezone!
 '%1' is not allowed ('%2')!	etemplate	en	'%1' is NOT allowed ('%2')!
 '%1' is not allowed%2)!	etemplate	en	'%1' is NOT allowed%2)!
 1 minute	etemplate	en	1 Minute

From 24befa42989611b4e435f15b2ebecf2259c8aadc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 12 Oct 2015 16:21:57 +0000
Subject: [PATCH 118/130] copy 14.3 changelog to trunk to satisfy update
 checker

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

diff --git a/doc/rpm-build/debian.changes b/doc/rpm-build/debian.changes
index a861acecfc..1d43cc1515 100644
--- a/doc/rpm-build/debian.changes
+++ b/doc/rpm-build/debian.changes
@@ -1,3 +1,24 @@
+egroupware-epl (14.3.20151012) hardy; urgency=low
+
+  * Calendar/eSync: iOS 9.0.2 (maybe other clients and versions too) moved start- and end-date of synchronised meeting requests to date of sync
+  * Calendar: use event title for mails generated via edit popup actions: mail all participants and meeting request
+  * Calendar/Mail: fix edit action meeting-requests to NOT set content-disposition: attachment, as this seems to stop automatic processing in Exchange
+  * Calendar/CalDAV: fixed event not show if user only participates in an exeception (not the master) and has no read-rights for any master participant
+  * Calendar/CalDAV: could not set own status for participation in an exception, if not being a participant of master
+  * Calendar/CalDAV: fix Outlook does not import invitations with wired error "organizer needs not to send responses"
+  * Calendar/Filemanager: display warning when clicking on an iCal file with more then 1 event, only first one is displayed
+  * Projectmanager: fix external role to NOT lose project when storing a new timesheet
+  * Wiki: respect table settings (eg. border) of user in html
+  * Wiki: search in comment too
+  * Tracker: CRM bugfixes
+  * Preferences: Fix ACL error allowing regular users to delete global categories
+  * Mail: implement the sorting by AutoFolders into the retrieval of folders and fix some sorting issues
+  * eTemplate: setting higher request timeout of 4 hours (was 2 hours)
+  * Addressbook: allow eg. telephone apps to jump directly into CRM view of a phonenumber with https://domain.com/egroupware/index.php?menuaction=addressbook.addressbook_ui.view&search="49 123 456789"&ajax=true&cd=yes
+  * LDAP: fix not working connect under newer PHP 5.6 (maybe other versions too) with PHP Warning: invalid port number: 0
+
+ -- Ralf Becker <rb@stylite.de>  Mon, 12 Oct 2015 13:59:59 +0200
+
 egroupware-epl (14.3.20150908) hardy; urgency=low
 
   * All apps: fix broken group-favorites

From 9f1b92aa1d691a01d267cfd1c90a5411b0fe9c32 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 12 Oct 2015 18:34:47 +0000
Subject: [PATCH 119/130] fix due to caching and reusing of connection not
 correctly set $this->Type == "mysql"

---
 phpgwapi/inc/class.egw_db.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 5916f439e3..164e6c0df2 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -560,7 +560,12 @@ class egw_db
 			$Host = preg_replace('/password=[^ ]+/','password=$Password',$Host);	// eg. postgres dsn contains password
 			throw new egw_exception_db_connection("ADOdb::$connect($Host, $User, \$Password, $Database) reconnect failed.");
 		}
-
+		// fix due to caching and reusing of connection not correctly set $this->Type == 'mysql'
+		if ($this->Type == 'mysqli')
+		{
+			$this->setupType = $this->Type;
+			$this->Type = 'mysql';
+		}
 		if ($new_connection)
 		{
 			foreach(get_included_files() as $file)

From 887cd00c4c2943760450a748c08a67ebea5880b1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 13 Oct 2015 07:08:10 +0000
Subject: [PATCH 120/130] allow to use alternate location name "hook_location",
 if app needs original name "location", like eg. calendar

---
 phpgwapi/inc/class.hooks.inc.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index d74f7d571e..df98706e02 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -51,7 +51,7 @@ class hooks
 	/**
 	 * constructor, reads and caches the complete hooks table
 	 *
-	 * @param egw_db $db=null database class, if null we use $GLOBALS['egw']->db
+	 * @param egw_db $db =null database class, if null we use $GLOBALS['egw']->db
 	 */
 	function __construct($db=null)
 	{
@@ -94,7 +94,7 @@ class hooks
 	function process($args, $order = array(), $no_permission_check = False)
 	{
 		//echo "<p>".__METHOD__.'('.array2string($args).','.array2string($order).','.array2string($no_permission_check).")</p>\n";
-		$location = is_array($args) ? $args['location'] : $args;
+		$location = is_array($args) ? (isset($args['hook_location']) ? $args['hook_location'] : $args['location']) : $args;
 
 		$hooks = $this->locations[$location];
 		if (!isset($hooks) || empty($hooks)) return array();	// not a single app implements that hook
@@ -123,16 +123,16 @@ class hooks
 	 * @param string|array $args location-name as string or array with keys location, appname and
 	 *	further data to be passed to the hook, if its a new method-hook
 	 * @param string $appname name of the app, which's hook to execute, if empty the current app is used
-	 * @param boolean $no_permission_check if True execute all hooks, not only the ones a user has rights to
+	 * @param boolean $no_permission_check =false if True execute all hooks, not only the ones a user has rights to
 	 *	$no_permission_check should *ONLY* be used when it *HAS* to be. (jengo)
-	 * @param boolean $try_unregisterd If true, try to include old file-hook anyway (for setup)
+	 * @param boolean $try_unregistered =false If true, try to include old file-hook anyway (for setup)
 	 * @return mixed False if no hook exists, True if old hook exists and whatever the new method-hook returns (can be True or False too!).
 	 */
 	function single($args, $appname = '', $no_permission_check = False,$try_unregistered = False)
 	{
 		//echo "<p>hooks::single(".array2string($args).",'$appname','$no_permission_check','$try_unregistered')</p>\n";
 		if (!is_array($args)) $args = array('location' => $args);
-		$location = $args['location'];
+		$location = isset($args['hook_location']) ? $args['hook_location'] : $args['location'];
 
 		if (!$appname)
 		{
@@ -224,7 +224,7 @@ class hooks
 	 * First all existing hooks of $appname get deleted in the db and then the given ones get registered.
 	 *
 	 * @param string $appname Application 'name'
-	 * @param array $hooks=null hooks to register, eg $setup_info[$app]['hooks'] or not used for only deregister the hooks
+	 * @param array $hooks =null hooks to register, eg $setup_info[$app]['hooks'] or not used for only deregister the hooks
 	 * @return boolean|int false on error, true if new hooks are supplied and registed or number of removed hooks
 	 */
 	function register_hooks($appname,$hooks=null)
@@ -379,7 +379,7 @@ class hooks
 		);
 		display_sidebox($appname, lang('PGP Encryption'), $file);
 	}
-	
+
 	/**
 	 * Static function to build egw tutorial sidebox menu
 	 *

From a64cfea299410758b235f4d5295c4e110d323e2a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 13 Oct 2015 07:11:52 +0000
Subject: [PATCH 121/130] using new hook location name "hook_location"

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

diff --git a/etemplate/inc/class.etemplate_new.inc.php b/etemplate/inc/class.etemplate_new.inc.php
index f001b1f9ed..c5d1201016 100644
--- a/etemplate/inc/class.etemplate_new.inc.php
+++ b/etemplate/inc/class.etemplate_new.inc.php
@@ -103,11 +103,11 @@ class etemplate_new extends etemplate_widget_template
 	function exec($method,array $content,array $sel_options=null,array $readonlys=null,array $preserv=null,$output_mode=0,$ignore_validation='',array $changes=null)
 	{
 		$hook_data = $GLOBALS['egw']->hooks->process(
-			array('location'        => 'etemplate2_before_exec') +
+			array('hook_location'   => 'etemplate2_before_exec') +
 			array('location_name'   => $this->name) +
 			array('location_object' => &$this) +
 			$content
-			);
+		);
 
 		foreach($hook_data as $extras) {
 			if (!$extras) continue;
@@ -127,7 +127,7 @@ class etemplate_new extends etemplate_widget_template
 			}
 		}
 		unset($hook_data);
-		
+
 		// Include the etemplate2 javascript code
 		egw_framework::validate_file('.', 'etemplate2', 'etemplate');
 
@@ -350,7 +350,7 @@ class etemplate_new extends etemplate_widget_template
 
 		$hook_data = $GLOBALS['egw']->hooks->process(
 			array(
-				'location'        => 'etemplate2_before_process',
+				'hook_location'   => 'etemplate2_before_process',
 				'location_name'   => $template->id) +
 				self::complete_array_merge(self::$request->preserv, $validated)
 			);
@@ -384,7 +384,7 @@ class etemplate_new extends etemplate_widget_template
 
 		$hook_data = $GLOBALS['egw']->hooks->process(
 			array(
-				'location'        => 'etemplate2_after_process',
+				'hook_location'   => 'etemplate2_after_process',
 				'location_name'   => $template->id) +
 				$tcontent
 			);

From 33e15ea3f4c689ab691a4eca16be294e2f2ffbd1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 13 Oct 2015 12:45:18 +0000
Subject: [PATCH 122/130] fix PHP Fatal error this->mail->getErrorMessage() and
 using Request::GetDeviceID()

---
 mail/inc/class.mail_zpush.inc.php | 46 +++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/mail/inc/class.mail_zpush.inc.php b/mail/inc/class.mail_zpush.inc.php
index 84b8d364a3..384cf8ad40 100644
--- a/mail/inc/class.mail_zpush.inc.php
+++ b/mail/inc/class.mail_zpush.inc.php
@@ -236,7 +236,8 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	private function _connect($account=0, $verify_mode=false)
 	{
 		static $waitOnFailure = null;
-		if (is_null($account)) $account = 0;
+		//if (is_null($account)) $account = 0;
+		if (!$account) $account = self::$profileID ? self::$profileID : 0;
 		if ($this->mail && $this->account != $account) $this->_disconnect();
 
 		$hereandnow = egw_time::to('now','ts');
@@ -245,22 +246,22 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 
 		$connectionFailed = false;
 
-		if ($verify_mode==false && (is_null($waitOnFailure)||empty($waitOnFailure[self::$profileID])||empty($waitOnFailure[self::$profileID][$this->backend->_devid])))
+		if ($verify_mode==false && (is_null($waitOnFailure)||empty($waitOnFailure[self::$profileID])||empty($waitOnFailure[self::$profileID][Request::GetDeviceID()])))
 		{
 			$waitOnFailure = egw_cache::getCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*2);
 		}
-		if (isset($waitOnFailure[self::$profileID]) && !empty($waitOnFailure[self::$profileID]) && !empty($waitOnFailure[self::$profileID][$this->backend->_devid]) && isset($waitOnFailure[self::$profileID][$this->backend->_devid]['lastattempt']) && !empty($waitOnFailure[self::$profileID][$this->backend->_devid]['lastattempt']) && isset($waitOnFailure[self::$profileID][$this->backend->_devid]['howlong']) && !empty($waitOnFailure[self::$profileID][$this->backend->_devid]['howlong']))
+		if (isset($waitOnFailure[self::$profileID]) && !empty($waitOnFailure[self::$profileID]) && !empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]) && isset($waitOnFailure[self::$profileID][Request::GetDeviceID()]['lastattempt']) && !empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]['lastattempt']) && isset($waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']) && !empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']))
 		{
-			if ($waitOnFailure[self::$profileID][$this->backend->_devid]['lastattempt']+$waitOnFailure[self::$profileID][$this->backend->_devid]['howlong']<$hereandnow)
+			if ($waitOnFailure[self::$profileID][Request::GetDeviceID()]['lastattempt']+$waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']<$hereandnow)
 			{
-				if ($this->debugLevel>0) error_log(__METHOD__.__LINE__.'# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']." Refuse to open connection for Profile:".self::$profileID.' Device '.$this->backend->_devid.' should still wait '.array2string($waitOnFailure[self::$profileID][$this->backend->_devid]));
+				if ($this->debugLevel>0) error_log(__METHOD__.__LINE__.'# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']." Refuse to open connection for Profile:".self::$profileID.' Device '.Request::GetDeviceID().' should still wait '.array2string($waitOnFailure[self::$profileID][Request::GetDeviceID()]));
 				//header("HTTP/1.1 503 Service Unavailable");
-				$hL = $waitOnFailure[self::$profileID][$this->backend->_devid]['lastattempt']+$waitOnFailure[self::$profileID][$this->backend->_devid]['howlong']-$hereandnow;
+				$hL = $waitOnFailure[self::$profileID][Request::GetDeviceID()]['lastattempt']+$waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']-$hereandnow;
 				header("Retry-After: 30");
 				// let z-push know we want to terminate
-				ZLog::Write(LOGLEVEL_ERROR, "($account) still waiting for Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.$this->backend->_devid." Should wait for:".$waitaslongasthis.'(s)'.' WaitInfoStored2Cache:'.array2string($waitOnFailure));
+				ZLog::Write(LOGLEVEL_ERROR, "($account) still waiting for Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID()." Should wait for:".$waitaslongasthis.'(s)'.' WaitInfoStored2Cache:'.array2string($waitOnFailure));
 				throw new HTTPReturnCodeException('Service Unavailable', 503);
-				/*$ethrown = new egw_exception_not_found(__METHOD__.__LINE__."($account) still waiting for Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.$this->backend->_devid." Should wait for:".$waitaslongasthis.'(s)'.' WaitInfoStored2Cache:'.array2string($waitOnFailure));
+				/*$ethrown = new egw_exception_not_found(__METHOD__.__LINE__."($account) still waiting for Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID()." Should wait for:".$waitaslongasthis.'(s)'.' WaitInfoStored2Cache:'.array2string($waitOnFailure));
 				_egw_log_exception($ethrown);
 				exit;*/
 			}
@@ -298,36 +299,35 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 				$errorMessage = $e->getMessage();
 			}
 		}
-		if (empty($waitOnFailure[self::$profileID][$this->backend->_devid])) $waitOnFailure[self::$profileID][$this->backend->_devid] = array('howlong'=>$this->waitOnFailureDefault,'lastattempt'=>$hereandnow);
+		if (empty($waitOnFailure[self::$profileID][Request::GetDeviceID()])) $waitOnFailure[self::$profileID][Request::GetDeviceID()] = array('howlong'=>$this->waitOnFailureDefault,'lastattempt'=>$hereandnow);
 		if ($connectionFailed)
 		{
 			// in verify_moode, we want the exeption, but not the exit
 			if ($verify_mode)
 			{
-				throw new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$this->mail->getErrorMessage().' for Instance='.$GLOBALS['egw_info']['user']['domain']);
+				throw new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain']);
 			}
 			else
 			{
-				//error_log(__METHOD__.__LINE__."($account) could not open connection!".$errorMessage);
-				//error_log(date('Y-m-d H:i:s').' '.__METHOD__.__LINE__."($account) can not open connection!".$this->mail->getErrorMessage()."\n",3,'/var/lib/egroupware/esync-imap.log');
-				//error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', URL='.
-				//	($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']."\n\n",3,'/var/lib/egroupware/esync-imap.log');
-				if ($waitOnFailure[self::$profileID][$this->backend->_devid]['howlong'] > $this->waitOnFailureLimit )
+				error_log(__METHOD__.__LINE__."($account) could not open connection!".$errorMessage);
+				error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', URL='.
+					($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']."\n\n",3,'/var/lib/egroupware/esync-imap.log');
+				if ($waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong'] > $this->waitOnFailureLimit )
 				{
-					$waitOnFailure[self::$profileID][$this->backend->_devid] = array('howlong'=>$this->waitOnFailureDefault,'lastattempt'=>$hereandnow);
+					$waitOnFailure[self::$profileID][Request::GetDeviceID()] = array('howlong'=>$this->waitOnFailureDefault,'lastattempt'=>$hereandnow);
 					egw_cache::setCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']),$waitOnFailure,$expiration=60*60*2);
 					header("HTTP/1.1 500 Internal Server Error");
-					throw new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.$this->backend->_devid);
+					throw new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID());
 				}
 				else
 				{
-					//error_log(__METHOD__.__LINE__.'# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']." Can not open connection for Profile:".self::$profileID.' Device:'.$this->backend->_devid.' should wait '.array2string($waitOnFailure[self::$profileID][$this->backend->_devid]));
-					$waitaslongasthis = $waitOnFailure[self::$profileID][$this->backend->_devid]['howlong'];
-					$waitOnFailure[self::$profileID][$this->backend->_devid] = array('howlong'=>(empty($waitOnFailure[self::$profileID][$this->backend->_devid]['howlong'])?$this->waitOnFailureDefault:$waitOnFailure[self::$profileID][$this->backend->_devid]['howlong']) * 2,'lastattempt'=>$hereandnow);
+					//error_log(__METHOD__.__LINE__.'# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']." Can not open connection for Profile:".self::$profileID.' Device:'.Request::GetDeviceID().' should wait '.array2string($waitOnFailure[self::$profileID][Request::GetDeviceID()]));
+					$waitaslongasthis = $waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong'];
+					$waitOnFailure[self::$profileID][Request::GetDeviceID()] = array('howlong'=>(empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong'])?$this->waitOnFailureDefault:$waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']) * 2,'lastattempt'=>$hereandnow);
 					egw_cache::setCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']),$waitOnFailure,$expiration=60*60*2);
 					header("HTTP/1.1 503 Service Unavailable");
 					header("Retry-After: ".$waitaslongasthis);
-					$ethrown = new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.$this->backend->_devid." Should wait for:".$waitaslongasthis.'(s)'.' WaitInfoStored2Cache:'.array2string($waitOnFailure));
+					$ethrown = new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID()." Should wait for:".$waitaslongasthis.'(s)'.' WaitInfoStored2Cache:'.array2string($waitOnFailure));
 					_egw_log_exception($ethrown);
 					exit;
 				}
@@ -336,9 +336,9 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		}
 		else
 		{
-			if (!empty($waitOnFailure[self::$profileID][$this->backend->_devid]))
+			if (!empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]))
 			{
-				$waitOnFailure[self::$profileID][$this->backend->_devid] = array();
+				$waitOnFailure[self::$profileID][Request::GetDeviceID()] = array();
 				egw_cache::setCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']),$waitOnFailure,$expiration=60*60*2);
 			}
 		}

From 52dd6bd3d70edfeaf3b85f195981ae7e7da52b09 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 13 Oct 2015 14:47:18 +0000
Subject: [PATCH 123/130] documented and reimplemented failure handling of
 connect method

---
 mail/inc/class.mail_zpush.inc.php | 159 ++++++++++++++----------------
 1 file changed, 76 insertions(+), 83 deletions(-)

diff --git a/mail/inc/class.mail_zpush.inc.php b/mail/inc/class.mail_zpush.inc.php
index 384cf8ad40..b4f9d45350 100644
--- a/mail/inc/class.mail_zpush.inc.php
+++ b/mail/inc/class.mail_zpush.inc.php
@@ -69,7 +69,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	 *
 	 * @var int
 	 */
-	protected $waitOnFailureDefault = 120;
+	protected $waitOnFailureDefault = 30;
 
 	/**
 	 * Integer waitOnFailureLimit how long (in seconds) to wait on connection failure until a 500 is raised
@@ -229,119 +229,112 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	/**
 	 * Open IMAP connection
 	 *
+	 * Behavior on connection failure (flags stored by user and device-ID):
+	 * a) if connections fails initialy:
+	 *    we log time under "lastattempt" and initial blocking-time of $this->waitOnFailureDefault=30 as "howlong" and
+	 *    send a "Retry-After: 30" header and a HTTP-Status of "503 Service Unavailable"
+	 * b) if clients attempts connection before lastattempt+howlong:
+	 *    send a "Retry-After: <remaining-time>" header and a HTTP-Status of "503 Service Unavailable"
+	 * c) if connection fails again (after the blocking time):
+	 *    we double the blocking time up to maximum of $this->waitOnFailureLimit=7200=2h and
+	 *    send a "Retry-After: 2*<blocking-time>" header and a HTTP-Status of "503 Service Unavailable"
+	 * d) if connection succeeds:
+	 *    we remove lastattempt and howlong flags
+	 *
+	 * @link https://social.msdn.microsoft.com/Forums/en-US/3658aca8-36fd-4058-9d43-10f48c3f7d3b/what-does-commandfrequency-mean-with-respect-to-eas-throttling?forum=os_exchangeprotocols
 	 * @param int $account integer id of account to use
 	 * @param boolean $verify_mode mode used for verify_settings; we want the exception but not the header stuff
 	 * @todo support different accounts
 	 */
 	private function _connect($account=0, $verify_mode=false)
 	{
-		static $waitOnFailure = null;
-		//if (is_null($account)) $account = 0;
 		if (!$account) $account = self::$profileID ? self::$profileID : 0;
 		if ($this->mail && $this->account != $account) $this->_disconnect();
 
-		$hereandnow = egw_time::to('now','ts');
 		$this->_wasteID = false;
 		$this->_sentID = false;
 
 		$connectionFailed = false;
 
-		if ($verify_mode==false && (is_null($waitOnFailure)||empty($waitOnFailure[self::$profileID])||empty($waitOnFailure[self::$profileID][Request::GetDeviceID()])))
+		if ($verify_mode)
 		{
-			$waitOnFailure = egw_cache::getCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*2);
-		}
-		if (isset($waitOnFailure[self::$profileID]) && !empty($waitOnFailure[self::$profileID]) && !empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]) && isset($waitOnFailure[self::$profileID][Request::GetDeviceID()]['lastattempt']) && !empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]['lastattempt']) && isset($waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']) && !empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']))
-		{
-			if ($waitOnFailure[self::$profileID][Request::GetDeviceID()]['lastattempt']+$waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']<$hereandnow)
-			{
-				if ($this->debugLevel>0) error_log(__METHOD__.__LINE__.'# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']." Refuse to open connection for Profile:".self::$profileID.' Device '.Request::GetDeviceID().' should still wait '.array2string($waitOnFailure[self::$profileID][Request::GetDeviceID()]));
-				//header("HTTP/1.1 503 Service Unavailable");
-				$hL = $waitOnFailure[self::$profileID][Request::GetDeviceID()]['lastattempt']+$waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']-$hereandnow;
-				header("Retry-After: 30");
-				// let z-push know we want to terminate
-				ZLog::Write(LOGLEVEL_ERROR, "($account) still waiting for Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID()." Should wait for:".$waitaslongasthis.'(s)'.' WaitInfoStored2Cache:'.array2string($waitOnFailure));
-				throw new HTTPReturnCodeException('Service Unavailable', 503);
-				/*$ethrown = new egw_exception_not_found(__METHOD__.__LINE__."($account) still waiting for Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID()." Should wait for:".$waitaslongasthis.'(s)'.' WaitInfoStored2Cache:'.array2string($waitOnFailure));
-				_egw_log_exception($ethrown);
-				exit;*/
-			}
-		}
-		if (!$this->mail)
-		{
-			$this->account = $account;
-			// todo: tell mail which account to use
-			//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
-			try
-			{
-				$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
-				if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
-				$this->mail->openConnection(self::$profileID,false);
-				$connectionFailed = false;
-			}
-			catch (Exception $e)
-			{
-				$connectionFailed = true;
-				$errorMessage = $e->getMessage();
-			}
+			$waitOnFailure = array();
 		}
 		else
 		{
-			//error_log(__METHOD__.__LINE__." connect with profileID: ".self::$profileID);
-			if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
-			try
+			$waitOnFailure = egw_cache::getInstance(__CLASS__, 'waitOnFailure-'.$GLOBALS['egw_info']['user']['account_lid'], function()
 			{
-				$this->mail->openConnection(self::$profileID,false);
-				$connectionFailed = false;
-			}
-			catch (Exception $e)
-			{
-				$connectionFailed = true;
-				$errorMessage = $e->getMessage();
-			}
+				return array();
+			});
 		}
-		if (empty($waitOnFailure[self::$profileID][Request::GetDeviceID()])) $waitOnFailure[self::$profileID][Request::GetDeviceID()] = array('howlong'=>$this->waitOnFailureDefault,'lastattempt'=>$hereandnow);
-		if ($connectionFailed)
+		$deviceWaitOnFailure =& $waitOnFailure[Request::GetDeviceID()];
+
+		// case b: client attempts new connection, before blocking-time is over --> return 503 Service Unavailable immediatly
+		if ($deviceWaitOnFailure && $deviceWaitOnFailure['lastattempt']+$deviceWaitOnFailure['howlong'] > time())
 		{
-			// in verify_moode, we want the exeption, but not the exit
-			if ($verify_mode)
+			$keepwaiting = $deviceWaitOnFailure['lastattempt']+$deviceWaitOnFailure['howlong'] - time();
+			ZLog::Write(LOGLEVEL_ERROR, "($account) still blocking for an other $keepwaiting s #".self::$profileID."!".' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID());
+			// let z-push know we want to terminate
+			header("Retry-After: ".$keepwaiting);
+			throw new HTTPReturnCodeException('Service Unavailable', 503);
+		}
+		try {
+			if (!$this->mail)
 			{
-				throw new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain']);
+				$this->account = $account;
+				// todo: tell mail which account to use
+				//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
+				$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+				if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
 			}
 			else
 			{
-				error_log(__METHOD__.__LINE__."($account) could not open connection!".$errorMessage);
-				error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', URL='.
-					($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']."\n\n",3,'/var/lib/egroupware/esync-imap.log');
-				if ($waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong'] > $this->waitOnFailureLimit )
-				{
-					$waitOnFailure[self::$profileID][Request::GetDeviceID()] = array('howlong'=>$this->waitOnFailureDefault,'lastattempt'=>$hereandnow);
-					egw_cache::setCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']),$waitOnFailure,$expiration=60*60*2);
-					header("HTTP/1.1 500 Internal Server Error");
-					throw new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID());
-				}
-				else
-				{
-					//error_log(__METHOD__.__LINE__.'# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']." Can not open connection for Profile:".self::$profileID.' Device:'.Request::GetDeviceID().' should wait '.array2string($waitOnFailure[self::$profileID][Request::GetDeviceID()]));
-					$waitaslongasthis = $waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong'];
-					$waitOnFailure[self::$profileID][Request::GetDeviceID()] = array('howlong'=>(empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong'])?$this->waitOnFailureDefault:$waitOnFailure[self::$profileID][Request::GetDeviceID()]['howlong']) * 2,'lastattempt'=>$hereandnow);
-					egw_cache::setCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']),$waitOnFailure,$expiration=60*60*2);
-					header("HTTP/1.1 503 Service Unavailable");
-					header("Retry-After: ".$waitaslongasthis);
-					$ethrown = new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$errorMessage.' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID()." Should wait for:".$waitaslongasthis.'(s)'.' WaitInfoStored2Cache:'.array2string($waitOnFailure));
-					_egw_log_exception($ethrown);
-					exit;
-				}
+				//error_log(__METHOD__.__LINE__." connect with profileID: ".self::$profileID);
+				if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
 			}
-			//die('Mail not or mis-configured!');
+			$this->mail->openConnection(self::$profileID,false);
 		}
-		else
+		catch (Exception $e)
 		{
-			if (!empty($waitOnFailure[self::$profileID][Request::GetDeviceID()]))
+			if ($verify_mode)
 			{
-				$waitOnFailure[self::$profileID][Request::GetDeviceID()] = array();
-				egw_cache::setCache(egw_cache::INSTANCE,'email','ActiveSyncWaitOnFailure'.trim($GLOBALS['egw_info']['user']['account_id']),$waitOnFailure,$expiration=60*60*2);
+				throw new egw_exception_not_found(__METHOD__.__LINE__."($account) can not open connection on Profile #".self::$profileID."!".$e->getMessage().' for Instance='.$GLOBALS['egw_info']['user']['domain']);
 			}
+			// case a) initial failure: set lastattempt and howlong=$this->waitOnFailureDefault=30
+			if (!$deviceWaitOnFailure || time() > $deviceWaitOnFailure['lastattempt']+$deviceWaitOnFailure['howlong'])
+			{
+				$deviceWaitOnFailure = array(
+					'lastattempt' => time(),
+					'howlong'     => $this->waitOnFailureDefault,
+				);
+			}
+			// case c) connection failed again: double waiting time up to max. of $this->waitOnFailureLimit=2h
+			else
+			{
+				$deviceWaitOnFailure = array(
+					'lastattempt' => time(),
+					'howlong'     => 2*$deviceWaitOnFailure['howlong'],
+				);
+				if ($deviceWaitOnFailure['howlong'] > $this->waitOnFailureLimit)
+				{
+					$deviceWaitOnFailure['howlong'] = $this->waitOnFailureLimit;
+				}
+			}
+			egw_cache::setInstance(__CLASS__, 'waitOnFailure-'.$GLOBALS['egw_info']['user']['account_lid'], $waitOnFailure);
+
+			ZLog::Write(LOGLEVEL_ERROR, "($account) connection failed ".$e->getMessage()." blocking for $deviceWaitOnFailure[howlong] s #".self::$profileID."!".' for Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', Device:'.Request::GetDeviceID());
+			// let z-push know we want to terminate
+			header("Retry-After: ".$deviceWaitOnFailure['howlong']);
+			throw new HTTPReturnCodeException('Service Unavailable', 503);
 		}
+
+		// case d) success, remove failure flag for device
+		if ($deviceWaitOnFailure)
+		{
+			$deviceWaitOnFailure = array();
+			egw_cache::setInstance(__CLASS__, 'waitOnFailure-'.$GLOBALS['egw_info']['user']['account_lid'], $waitOnFailure);
+		}
+
 		$this->_wasteID = $this->mail->getTrashFolder(false);
 		//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
 		$this->_sentID = $this->mail->getSentFolder(false);

From 8980fdb1fcd80f29268cc3acf065e3a436d3208b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 13 Oct 2015 15:03:41 +0000
Subject: [PATCH 124/130] Add background attribute to the DOMWidget in order to
 be able to set background-image via etemplate

---
 etemplate/js/et2_core_DOMWidget.js | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/etemplate/js/et2_core_DOMWidget.js b/etemplate/js/et2_core_DOMWidget.js
index 59551eb403..47dc2dc9b4 100644
--- a/etemplate/js/et2_core_DOMWidget.js
+++ b/etemplate/js/et2_core_DOMWidget.js
@@ -87,6 +87,12 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
 			type: "string",
 			default: '',
 			description: 'data="mime:${row}[mime]" would generate data-mime="..." in DOM, eg. to use it in CSS on a parent'
+		},
+		background: {
+			name: "Add background image",
+			type: "string",
+			default:'',
+			description: "Sets background image, left, right and scale on DOM",
 		}
 	},
 
@@ -423,7 +429,23 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
 			}
 		}
 	},
-
+	
+	set_background: function(_value)
+	{
+		var node = this.getDOMNode(this);
+		var values = '';
+		if (_value && node)
+		{
+			values = _value.split(',');
+			jQuery(node).css({
+				"background-image":'url("'+values[0]+'")',
+				"background-position-x":values[1],
+				"background-position-y":values[2],
+				"background-scale":values[3]
+			});
+		}
+	},
+	
 	/**
 	 * Set Actions on the widget
 	 *

From 258846103a253a23ff30ec4f6e5c57be5599d3ba Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 13 Oct 2015 15:06:04 +0000
Subject: [PATCH 125/130] supplement flagsstring to mod, to represent flag
 changes

---
 mail/inc/class.mail_zpush.inc.php | 351 +++++++++++++++++-------------
 1 file changed, 203 insertions(+), 148 deletions(-)

diff --git a/mail/inc/class.mail_zpush.inc.php b/mail/inc/class.mail_zpush.inc.php
index b4f9d45350..b4873aeb56 100644
--- a/mail/inc/class.mail_zpush.inc.php
+++ b/mail/inc/class.mail_zpush.inc.php
@@ -348,7 +348,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	 */
 	private function _disconnect()
 	{
-		debugLog(__METHOD__);
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__);
 		if ($this->mail) $this->mail->closeConnection();
 
 		unset($this->mail);
@@ -364,24 +364,24 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	public function GetFolderList()
 	{
 		$folderlist = array();
-		debugLog(__METHOD__.__LINE__);
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
 		/*foreach($available_accounts as $account)*/ $account = 0;
 		{
 			$this->_connect($account);
 			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
-			debugLog(__METHOD__.__LINE__.array2string($this->folders));
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($this->folders));
 
 			foreach ($this->folders as $folder => $folderObj) {
-				debugLog(__METHOD__.__LINE__.' folder='.$folder);
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' folder='.$folder);
 				$folderlist[] = $f = array(
 					'id'     => $this->createID($account,$folder),
 					'mod'    => $folderObj->shortDisplayName,
 					'parent' => $this->getParentID($account,$folder),
 				);
-				if ($this->debugLevel>0) debugLog(__METHOD__."() returning ".array2string($f));
+				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($f));
 			}
 		}
-		debugLog(__METHOD__."() returning ".array2string($folderlist));
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() returning ".array2string($folderlist));
 
 		return $folderlist;
 	}
@@ -426,7 +426,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
      */
 	public function SendMail($smartdata)
 	{
-		//$this->debugLevel=3;
+		//$this->debugLevel=2;
 		$ClientSideMeetingRequest = false;
 		$allowSendingInvitations = 'sendifnocalnotif';
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
@@ -441,8 +441,8 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		}
 		$smartdata_task = ($smartdata->replyflag?'reply':($smartdata->forwardflag?'forward':'new'));
 
-   		debugLog(__METHOD__.__LINE__ . (isset($smartdata->mime) ? $smartdata->mime : ""). "task: ".(isset($smartdata_task) ? $smartdata_task : "")." itemid: ".(isset($smartdata->source->itemid) ? $smartdata->source->itemid : "")." folder: ".(isset($smartdata->source->folderid) ? $smartdata->source->folderid : ""));
-		if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
+   		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__ . (isset($smartdata->mime) ? $smartdata->mime : ""). "task: ".(isset($smartdata_task) ? $smartdata_task : "")." itemid: ".(isset($smartdata->source->itemid) ? $smartdata->source->itemid : "")." folder: ".(isset($smartdata->source->folderid) ? $smartdata->source->folderid : ""));
+		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Smartdata = ".array2string($smartdata));
 		//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 
 		// initialize our mail_bo
@@ -451,7 +451,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		// use the standardIdentity
 		$activeMailProfile = mail_bo::getStandardIdentityForProfile($activeMailProfiles,self::$profileID);
 
-		if ($this->debugLevel>2) debugLog(__METHOD__."(".__LINE__.")".' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.")".' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
 
 		// initialize the new egw_mailer object for sending
 		$mailObject = new egw_mailer(self::$profileID);
@@ -468,21 +468,21 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 
 		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") Header Sentmail To: ".array2string($addressObject) );
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail To: ".array2string($addressObject) );
 			//$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$toMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// CC
 		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") Header Sentmail CC: ".array2string($addressObject) );
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail CC: ".array2string($addressObject) );
 			//$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// BCC
 		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject) );
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject) );
 			//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$bccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
@@ -523,13 +523,13 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			{
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				if ($this->debugLevel>1) debugLog(__METHOD__."(".__LINE__.") fetched Body as :". $simpleBodyType.'=> Created AltBody');
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as :". $simpleBodyType.'=> Created AltBody');
 			}
 			else
 			{
 				$AltBody = $body;
 				$Body =  trim(translation::convertHTMLToText($body));
-				if ($this->debugLevel>1) debugLog(__METHOD__."(".__LINE__.") fetched Body as :". $simpleBodyType.'=> Created Body');
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as :". $simpleBodyType.'=> Created Body');
 			}
 		}
 		else
@@ -541,20 +541,20 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]",
 				($html_body = $mailObject->findBody('html')) ? $html_body->getContents() : null);
 		}
-		if ($this->debugLevel>1 && $Body) debugLog(__METHOD__."(".__LINE__.") fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
-		if ($this->debugLevel>1 && $AltBody) debugLog(__METHOD__."(".__LINE__.") fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		if ($this->debugLevel>1 && $Body) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
+		if ($this->debugLevel>1 && $AltBody) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
 		//error_log(__METHOD__.__LINE__.array2string($mailObject));
 		// if this is a multipart message with a boundary, we must use the original body
-		//if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
+		//if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
         if ($use_orgbody) {
-    	    if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
+    	    ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") use_orgbody = true ContentType:".$ContentType);
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
 			if (stripos($ContentType,'text/calendar') !== false )
 			{
 				$body = ($text_body = $mailObject->findBody('calendar')) ? $text_body->getContents() : null;
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") we have a Client Side Meeting Request");
+				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") we have a Client Side Meeting Request");
 				// try figuring out the METHOD -> [ContentType] => text/calendar; name=meeting.ics; method=REQUEST
 				$tA = explode(' ',$ContentType);
 				foreach ((array)$tA as $k => $p)
@@ -597,12 +597,12 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false) return true;
 		// as we use our mailer (horde mailer) it is detecting / setting the mimetype by itself while creating the mail
 /*
-		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' retrieved Body:'.$body);
+		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' retrieved Body:'.$body);
 		$body = str_replace("\r",((preg_match("^text/html^i", $ContentType))?'<br>':""),$body); // what is this for?
-		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' retrieved Body (modified):'.$body);
+		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' retrieved Body (modified):'.$body);
 */
 		// add signature!! -----------------------------------------------------------------
-		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
 		try
 		{
 			$acc = emailadmin_account::read($this->mail->icServer->ImapServerId);
@@ -624,7 +624,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		$beforeHtml = ($disableRuler ?'&nbsp;<br>':'&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
 		$beforePlain = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
 		$sigText = emailadmin_imapbase::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
-		if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Signature to use:'.$sigText);
 		$sigTextHtml = $beforeHtml.$sigText;
 		$sigTextPlain = $beforePlain.translation::convertHTMLToText($sigText);
 		$isreply = $isforward = false;
@@ -636,26 +636,26 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		{
 			// now get on, and fetch the original mail
 			$uid = $smartdata->source->itemid;
-			if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 
 			$this->mail->reopen($folder);
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true);
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
 		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
 				// may be html
-				if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 				$isreply = true;
 			}
 			// plain text Message part
-			if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
 			// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
 			$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
 			$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct);//$this->ui->getdisplayableBody($bodyStruct,false);
 			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-				if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 				$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 				$isreply = true;
 			}
@@ -663,7 +663,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			{
 				$isreply = true;
 				$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-				if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
 			}
 		}
 
@@ -686,7 +686,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			}
 			// construct the uid of the message out of the itemid - seems to be the uid, no construction needed
 			$uid = $smartdata->source->itemid;
-			if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.")IMAP Smartfordward is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.")IMAP Smartfordward is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 
 			$this->mail->reopen($folder);
@@ -708,33 +708,33 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			{
 				// now get on, and fetch the original mail
 				$uid = $smartdata->source->itemid;
-				if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") IMAP Smartreply is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 				$this->splitID($smartdata->source->folderid, $account, $folder);
 
 				$this->mail->reopen($folder);
 				$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true);
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
 				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
 					// may be html
-					if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 					$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 					$isforward = true;
 				}
 				// plain text Message part
-				if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
+				if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain, fetch text:');
 				// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
 				$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
 				$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct);//$this->ui->getdisplayableBody($bodyStruct,false);
 				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-					if ($this->debugLevel>0) debugLog(__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 					$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 					$isforward = true;
 				}
 				if (!empty($bodyBUFF) && empty($bodyBUFFHtml) && !empty($AltBody))
 				{
 					$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
 					$isforward = true;
 				}
 				// get all the attachments and add them too.
@@ -744,15 +744,15 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 				$attachmentNames = false;
 				if (is_array($attachments) && count($attachments)>0)
 				{
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
 					foreach((array)$attachments as $key => $attachment)
 					{
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
 						$attachmentNames .= $attachment['name']."\n";
 						$attachmentData = '';
 						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
 						/*$x =*/ $mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), $attachment['mimeType']);
-						//debugLog(__METHOD__.__LINE__.' added part with number:'.$x);
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' added part with number:'.$x);
 					}
 				}
 			}
@@ -766,36 +766,36 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		// now set the body
 		if ($AltBody && ($html_body = $mailObject->findBody('html')))
 		{
-			if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.$AltBody);
+			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$AltBody);
 			$html_body->setContents($AltBody,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		if ($Body && ($text_body = $mailObject->findBody('plain')))
 		{
-			if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.$Body);
+			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.$Body);
 			$text_body->setContents($Body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
         //debugLog("IMAP-SendMail: parsed message: ". print_r($message,1));
-		if ($this->debugLevel>2) debugLog(__METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
+		if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): MailObject:".array2string($mailObject));
 
 		// set a higher timeout for big messages
 		@set_time_limit(120);
-
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> '.' about to send ....');
 		// send
 		$send = true;
 		try {
 			$mailObject->Send();
 		}
 		catch(phpmailerException $e) {
-			debugLog(__METHOD__."(".__LINE__.") The email could not be sent. Last-SMTP-error: ". $e->getMessage());
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") The email could not be sent. Last-SMTP-error: ". $e->getMessage());
 			$send = false;
 		}
 
 		if (( $smartdata_task == 'reply' || $smartdata_task == 'forward') && $send == true)
 		{
 			$uid = $smartdata->source->itemid;
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' tASK:'.$smartdata_task." FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' tASK:'.$smartdata_task." FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
 			$this->splitID($smartdata->source->folderid, $account, $folder);
 			//error_log(__METHOD__.__LINE__.' Folder:'.$folder.' Uid:'.$uid);
 			$this->mail->reopen($folder);
@@ -828,7 +828,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			// No Sent folder set, try defaults
 			else
 			{
-				debugLog(__METHOD__."(".__LINE__.") IMAP-SendMail: No Sent mailbox set");
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") IMAP-SendMail: No Sent mailbox set");
 				// we dont try guessing
 				$asf = true;
 			}
@@ -850,7 +850,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 						$flags = '';
 					}
 					$asf = true;
-					//debugLog(__METHOD__.__LINE__.'->'.array2string($this->mail->icServer));
+					//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.array2string($this->mail->icServer));
 					$this->mail->openConnection(self::$profileID,false);
 					if ($this->mail->folderExists($folderName)) {
 						try
@@ -861,15 +861,15 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 						catch (egw_exception_wrong_userinput $e)
 						{
 							//$asf = false;
-							debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$mailObject->getHeader('Subject'),$folderName,$e->getMessage()));
+							ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$mailObject->getHeader('Subject'),$folderName,$e->getMessage()));
 						}
 					}
 					else
 					{
 						//$asf = false;
-						debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$mailObject->getHeader('Subject'),$folderName));
+						ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$mailObject->getHeader('Subject'),$folderName));
 					}
-			        debugLog(__METHOD__."(".__LINE__."): Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
+			        ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__."): Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
 				}
 				//$this->mail->closeConnection();
 			}
@@ -879,14 +879,14 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 
 		if ($send && $asf)
 		{
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' -> send successfully');
 			return true;
 		}
 		else
 		{
-			debugLog(__METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ?" is ClientSideMeetingRequest (we ignore the failure)":""));
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ?" is ClientSideMeetingRequest (we ignore the failure)":""));
 			return ($ClientSideMeetingRequest ? true : 120);   //MAIL Submission failed, see MS-ASCMD
 		}
-
 	}
 
 	/**
@@ -903,24 +903,24 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	public function GetMessage($folderid, $id, $contentparameters)
 	{
 		//$this->debugLevel=4;
-		debugLog(__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' ContentParams='.array2string($contentparameters));
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' ContentParams='.array2string($contentparameters));
 		$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		$mimesupport = $contentparameters->GetMimeSupport();
-		debugLog(__METHOD__."() truncsize=$truncsize, mimeSupport=".array2string($mimesupport));
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."() truncsize=$truncsize, mimeSupport=".array2string($mimesupport));
 		$bodypreference = $contentparameters->GetBodyPreference(); /* fmbiete's contribution r1528, ZP-320 */
 
 		//$this->debugLevel=4;
 		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
-		debugLog(__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
 		$account = $_folderName = $xid = null;
 		$this->splitID($folderid,$account,$_folderName,$xid);
 		$this->mail->reopen($_folderName);
 		$stat = $this->StatMessage($folderid, $id);
-		if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($stat));
+		if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($stat));
 		// StatMessage should reopen the folder in question, so we dont need folderids in the following statements.
 		if ($stat)
 		{
-			debugLog(__METHOD__.__LINE__." Message $id with stat ".array2string($stat));
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." Message $id with stat ".array2string($stat));
 			// initialize the object
 			$output = new SyncMail();
 			$headers = $this->mail->getMessageHeader($id,'',true,true,$_folderName);
@@ -932,7 +932,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			//$rawHeaders = $this->mail->getMessageRawHeader($id);
 			// simple style
 			// start AS12 Stuff (bodypreference === false) case = old behaviour
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
 
 			if ($bodypreference === false) {
 				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true,$_folderName);
@@ -957,17 +957,27 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 				//Select body type preference
 				$bpReturnType = 1;//SYNC_BODYPREFERENCE_PLAIN;
 				if ($bodypreference !== false) {
-					$bpReturnType = Utils::GetBodyPreferenceBestMatch($bodypreference); // changed by mku ZP-330
+					// bodypreference can occur multiple times
+					// usually we would use Utils::GetBodyPreferenceBestMatch($bodypreference);
+					$bpReturnType = Utils::GetBodyPreferenceBestMatch($bodypreference);
+/*
+					foreach($bodypreference as $bpv)
+					{
+						// we use the last, or MIMEMESSAGE when present
+						$bpReturnType = $bpv;
+						if ($bpReturnType==SYNC_BODYPREFERENCE_MIME) break;
+					}
+*/
 				}
-				debugLog(__METHOD__.__LINE__." getBodyPreferenceBestMatch: ".array2string($bpReturnType));
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." getBodyPreferenceBestMatch: ".array2string($bpReturnType));
 				// set the protocoll class
 				$output->asbody = new SyncBaseBody();
 				// fetch the body (try to gather data only once)
 				$css ='';
 				$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
-				if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+				if ($this->debugLevel>2) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
 				$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true);//$this->ui->getdisplayableBody($bodyStruct,false);
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$body);
+				if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' html_only:'.$body);
 			    if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
 					// may be html
 					if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only)');
@@ -978,18 +988,19 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 					if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text (HTML, if no text available)');
 					$output->nativebodytype=1;
 					$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
 					$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct);//$this->ui->getdisplayableBody($bodyStruct,false);
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+					if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' never display html(plain text only):'.$body);
 				}
 				// whatever format decode (using the correct encoding)
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
+				if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."MIME Body".' Type:'.($output->nativebodytype==2?' html ':' plain ').$body);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
 				// prepare plaintextbody
+				$plainBody='';
 				if ($output->nativebodytype == 2)
 				{
 					$bodyStructplain = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-					if($bodyStructplain[0]['error']==1)
+					if(isset($bodyStructplain[0])&&isset($bodyStructplain[0]['error'])&&$bodyStructplain[0]['error']==1)
 					{
 						$plainBody = translation::convertHTMLToText($body); // always display with preserved HTML
 					}
@@ -1003,21 +1014,23 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 				// remove all other html
 				$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
 				$plainBody = strip_tags($plainBody);
-				if ($this->debugLevel>3 && $output->nativebodytype==1) debugLog(__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+				if ($this->debugLevel>3 && $output->nativebodytype==1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Plain Text:'.$plainBody);
 				//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
-				if ($bpReturnType==4)//$mimesupport==2 || $mimesupport ==1 && stristr($headers['CONTENT-TYPE'],'signed') !== false)
+				if ($bpReturnType==SYNC_BODYPREFERENCE_MIME)//4)//$mimesupport==2 || $mimesupport ==1 && stristr($headers['CONTENT-TYPE'],'signed') !== false)
 				{
-					debugLog(__METHOD__.__LINE__." bodypreference 4 requested");
-					$output->asbody->type = 4;
+					//SYNC_BODYPREFERENCE_MIME
+					ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." bodypreference 4 requested");
+					$output->asbody->type = SYNC_BODYPREFERENCE_MIME;//4;
 					$Body = $this->mail->getMessageRawBody($id, '', $_folderName);
 					if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__." Setting Mailobjectcontent to output:".$Body);
 					$output->asbody->data = $Body;
 				}
-				else if ($bpReturnType==2)
+				else if ($bpReturnType==2) //SYNC_BODYPREFERENCE_HTML
 				{
 					if ($this->debugLevel>0) debugLog("HTML Body with requested pref 2");
 					// Send HTML if requested and native type was html
 					$output->asbody->type = 2;
+					$output->nativebodytype = 2;
 					$htmlbody = '<html>'.
 						'<head>'.
 						'<meta name="Generator" content="Z-Push">'.
@@ -1038,7 +1051,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 					$htmlbody .= '</body>'.
 							'</html>';
 
-					if(isset($truncsize) && strlen($html) > $truncsize)
+					if(isset($truncsize) && strlen($htmlbody) > $truncsize)
 					{
 						$htmlbody = utf8_truncate($htmlbody,$truncsize);
 						$output->asbody->truncated = 1;
@@ -1057,6 +1070,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 					//$plain = str_replace("\n","\r\n",str_replace("\r","",$plain));
 					*/
 					$output->asbody->type = 1;
+					$output->nativebodytype = 1;
 					if(isset($truncsize) &&
 			    		strlen($plainBody) > $truncsize)
 					{
@@ -1075,50 +1089,57 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 				$output->asbody->estimatedDataSize = strlen($output->asbody->data);
 			}
 			// end AS12 Stuff
-			debugLog(__METHOD__.__LINE__.' gather Header info:'.$headers['SUBJECT'].' from:'.$headers['DATE']);
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Header info:'.$headers['SUBJECT'].' from:'.$headers['DATE']);
 			$output->read = $stat["flags"];
+
+			$output->flag = new SyncMailFlags();
+			if ($this->messages[$id]['flagged'] == 1)
+			{
+				$output->flag->flagstatus = 2;
+				//$output->flag->flagtype = "Flag for Follow up";
+			} else {
+				$output->flag->flagstatus = 0;
+			}
+			if ($this->messages[$id]['answered'])
+			{
+				$output->lastverexecuted = AS_REPLYTOSENDER;
+			}
+			elseif ($this->messages[$id]['forwarded'])
+			{
+				$output->lastverexecuted = AS_FORWARD;
+			}
 			$output->subject = $this->messages[$id]['subject'];
 			$output->importance = $this->messages[$id]['priority'] > 3 ? 0 :
 				($this->messages[$id]['priority'] < 3 ? 2 : 1) ;
 			$output->datereceived = $this->mail->_strtotime($headers['DATE'],'ts',true);
-			$output->displayto = ($headers['TO'] ? $headers['TO']:null); //$stat['FETCHED_HEADER']['to_name']
-			// $output->to = $this->messages[$id]['to_address']; //$stat['FETCHED_HEADER']['to_name']
-			// $output->from = $this->messages[$id]['sender_address']; //$stat['FETCHED_HEADER']['sender_name']
 //error_log(__METHOD__.__LINE__.' To:'.$headers['TO']);
 			$output->to = $headers['TO'];
+			if ($headers['TO']) $output->displayto = ($headers['TO'] ? $headers['TO']:null); //$stat['FETCHED_HEADER']['to_name']
 //error_log(__METHOD__.__LINE__.' From:'.$headers['FROM']);
 			$output->from = $headers['FROM'];
-			$output->cc = ($headers['CC'] ? $headers['CC']:null);
-			$output->reply_to = ($headers['REPLY_TO']?$headers['REPLY_TO']:null);
+			if (isset($headers['CC']) && $headers['CC']) $output->cc = ($headers['CC'] ? $headers['CC']:null);
+			if (isset($headers['REPLY_TO']) && $headers['REPLY_TO']) $output->reply_to = ($headers['REPLY_TO']?$headers['REPLY_TO']:null);
+
 			$output->messageclass = "IPM.Note";
 			if (stripos($this->messages[$id]['mimetype'],'multipart')!== false &&
 				stripos($this->messages[$id]['mimetype'],'signed')!== false)
 			{
 				$output->messageclass = "IPM.Note.SMIME.MultipartSigned";
 			}
-			// start AS12 Stuff
-			//$output->poommailflag = new SyncMailFlags();
-
-			if ($this->messages[$id]['flagged'] == 1)
-			{
-				$output->flag = new SyncMailFlags();
-				$output->flag->flagstatus = 2;
-				$output->flag->flagtype = "Flag for Follow up";
+			if (Request::GetProtocolVersion() >= 12.0) {
+				$output->contentclass = "urn:content-classes:message";
 			}
 
-			$output->internetcpid = 65001;
-			$output->contentclass="urn:content-classes:message";
-			// end AS12 Stuff
-
 			// start handle Attachments (include text/calendar multipart alternative)
 			$attachments = $this->mail->getMessageAttachments($id, $_partID='', $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=true, true, $_folderName);
-			if (is_array($attachments) && count($attachments)>0)
+			// Attachments should not needed for MIME messages, so skip this part if bpReturnType==4
+			if (/*$bpReturnType != SYNC_BODYPREFERENCE_MIME &&*/ is_array($attachments) && count($attachments)>0)
 			{
-				debugLog(__METHOD__.__LINE__.' gather Attachments for MessageID:'.$id.' found:'.count($attachments));
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' gather Attachments for MessageID:'.$id.' found:'.count($attachments));
 				//error_log(__METHOD__.__LINE__.array2string($attachments));
 				foreach ($attachments as $key => $attach)
 				{
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
 
 					// pass meeting requests to calendar plugin
 					if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
@@ -1127,6 +1148,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 						($output->meetingrequest = calendar_zpush::meetingRequest($attachment['attachment'])))
 					{
 						$output->messageclass = "IPM.Schedule.Meeting.Request";
+						unset($attachment);
 						continue;	// do NOT add attachment as attachment
 					}
 					if (Request::GetProtocolVersion() >= 12.0) {
@@ -1149,6 +1171,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 					//error_log(__METHOD__.__LINE__.'->'.$folderid . ":" . $id . ":" . $attach['partID']);
 
 					$attachment->attoid = "";//isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
+					//$attachment->isinline=0; // if not inline, do not use isinline
 					if (!empty($attach['cid']) && $attach['cid'] <> 'NIL' )
 					{
 						if ($bpReturnType != 4 && $attach['disposition'] == 'inline')
@@ -1171,11 +1194,17 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 					} else {
 						array_push($output->attachments, $attachment);
 					}
+					unset($attachment);
 				}
 			}
 			//$this->debugLevel=0;
 			// end handle Attachments
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($output));
+			unset($attachments);
+
+            // Language Code Page ID: http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756%28v=vs.85%29.aspx
+            $output->internetcpid = INTERNET_CPID_UTF8;
+
+			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($output));
 //$this->debugLevel=0;
 			return $output;
 		}
@@ -1198,12 +1227,12 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	{
 		if (!class_exists('calendar_zpush'))
 		{
-			debugLog(__METHOD__."(...) no EGroupware calendar installed!");
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(...) no EGroupware calendar installed!");
 			return null;
 		}
 		if (!($stat = $this->StatMessage($folderid, $requestid)))
 		{
-			debugLog(__METHOD__."($requestid, '$folderid', $response) returning FALSE (can NOT stat message)");
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($requestid, '$folderid', $response) returning FALSE (can NOT stat message)");
 			return false;
 		}
 		$ret = false;
@@ -1212,7 +1241,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
 				($attachment = $this->mail->getAttachment($requestid, $attach['partID'],0,false)))
 			{
-				debugLog(__METHOD__."($requestid, '$folderid', $response) iCal found, calling now backend->MeetingResponse('$attachment[attachment]')");
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($requestid, '$folderid', $response) iCal found, calling now backend->MeetingResponse('$attachment[attachment]')");
 
 				// calling backend again with iCal attachment, to let calendar add the event
 				if (($ret = $this->backend->MeetingResponse($attachment['attachment'],
@@ -1224,7 +1253,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 				break;
 			}
 		}
-		debugLog(__METHOD__."($requestid, '$folderid', $response) returning ".array2string($ret));
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($requestid, '$folderid', $response) returning ".array2string($ret));
 		return $ret;
 	}
 
@@ -1239,7 +1268,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	 * @return true, prints the content of the attachment
 	 */
 	function GetAttachmentData($fid,$attname) {
-		debugLog("getAttachmentData: $fid (attname: '$attname')");
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')".function_backtrace());
 		//error_log(__METHOD__.__LINE__." Fid: $fid (attname: '$attname')");
 		list($folderid, $id, $part) = explode(":", $attname);
 
@@ -1251,6 +1280,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		$attachment = $this->mail->getAttachment($id,$part,0,false,true,$folder);
         $SIOattachment = new SyncItemOperationsAttachment();
         $SIOattachment->data = $attachment['attachment'];
+		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname') Data:".$attachment['attachment']);
         if (isset($attachment['type']) )
             $SIOattachment->contenttype = $attachment['type'];
 
@@ -1270,7 +1300,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	 * @return SyncItemOperationsAttachment-object
 	 */
 	function ItemOperationsGetAttachmentData($fid,$attname) {
-		debugLog(__METHOD__.": $fid (attname: '$attname')");
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname')".function_backtrace());
 		//error_log(__METHOD__.__LINE__." Fid: $fid (attname: '$attname')");
 		list($folderid, $id, $part) = explode(":", $attname);
 
@@ -1325,17 +1355,17 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	 */
 	function ChangeMessage($folderid, $id, $message, $contentParameters)
 	{
-		debugLog(__METHOD__.__LINE__." $folderid, $id,".array2string($message).",".array2string($contentParameters));
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." $folderid, $id,".array2string($message).",".array2string($contentParameters));
 		//unset($folderid, $id, $message, $contentParameters);
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
 		if (isset($message->flag)) {
 			if (isset($message->flag->flagstatus) && $message->flag->flagstatus == 2) {
 				$rv = $this->mail->flagMessages((($message->flag->flagstatus == 2) ? "flagged" : "unflagged"), $id,$folder);
-				debugLog(__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . (($message->flag->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . (($message->flag->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
 			} else {
 				$rv = $this->mail->flagMessages("unflagged", $id,$folder);
-				debugLog(__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . "unflagged" . "-->". $rv);
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." -> set ".array2string($id).' in Folder '.$folder." as " . "unflagged" . "-->". $rv);
 			}
 		}
 		return $this->StatMessage($folderid, $id);
@@ -1371,7 +1401,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 
 		// move message
 		$rv = $this->mail->moveMessages($destFolder,(array)$id,true,$srcFolder,true);
-		debugLog(__METHOD__.__LINE__.": New Status of $destFolder :".array2string($status).", ReturnValOf moveMessage".array2string($rv)); // this may be true, so try using the nextUID value by examine
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.": New Status of $destFolder :".array2string($status).", ReturnValOf moveMessage".array2string($rv)); // this may be true, so try using the nextUID value by examine
 		// return the new id "as string"
 		return ($rv===true ? $uidNext : $rv[$id]) . "";
 	}
@@ -1389,7 +1419,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		if (empty($cutdate))
 		{
 			$cutdate = egw_time::to('now','ts')-(3600*24*28*3);
-			debugLog(__METHOD__.' Client set no truncationdate. Using 12 weeks.'.date("d-M-Y", $cutdate));
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' Client set no truncationdate. Using 12 weeks.'.date("d-M-Y", $cutdate));
 		}
 		return $this->fetchMessages($folderid, $cutdate);
 	}
@@ -1397,12 +1427,12 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	private function fetchMessages($folderid, $cutoffdate=NULL, $_id=NULL)
 	{
 		if ($this->debugLevel>1) $gstarttime = microtime (true);
-		//debugLog(__METHOD__.__LINE__);
+		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__);
 		$rv_messages = array();
 		// if the message is still available within the class, we use it instead of fetching it again
 		if (is_array($_id) && count($_id)==1 && is_array($this->messages) && isset($this->messages[$_id[0]]) && is_array($this->messages[$_id[0]]))
 		{
-			//debugLog(__METHOD__.__LINE__." the message ".$_id[0]." is still available within the class, we use it instead of fetching it again");
+			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." the message ".$_id[0]." is still available within the class, we use it instead of fetching it again");
 			$rv_messages = array('header'=>array($this->messages[$_id[0]]));
 		}
 		if (empty($rv_messages))
@@ -1412,9 +1442,9 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			if ($this->debugLevel>1)
 			{
 				$endtime = microtime(true) - $starttime;
-				debugLog(__METHOD__. " connect took : ".$endtime.' for account:'.$this->account);
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " connect took : ".$endtime.' for account:'.$this->account);
 			}
-			$messagelist = array();
+			$messagelist = $_filter = array();
 			// if not connected, any further action must fail
 			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
 			if ($this->debugLevel>1) $starttime = microtime (true);
@@ -1423,49 +1453,76 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			if ($this->debugLevel>1)
 			{
 				$endtime = microtime(true) - $starttime;
-				debugLog(__METHOD__. " splitID took : ".$endtime.' for FolderID:'.$folderid);
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " splitID took : ".$endtime.' for FolderID:'.$folderid);
 			}
-			if ($this->debugLevel>1) debugLog(__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
 			if ($this->debugLevel>1) $starttime = microtime (true);
 			$_numberOfMessages = (empty($cutoffdate)?250:99999);
 			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages, $_sort=0, $_reverse=false, $_filter, $_id);
 			if ($this->debugLevel>1)
 			{
 				$endtime = microtime(true) - $starttime;
-				debugLog(__METHOD__. " getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
+				ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
 			}
 		}
-		if ($_id == NULL && $this->debugLevel>1)  debugLog(__METHOD__." found :". count($rv_messages['header']));
-		//debugLog(__METHOD__.__LINE__.' Result:'.array2string($rv_messages));
+		if ($_id == NULL && $this->debugLevel>1)  ZLog::Write(LOGLEVEL_DEBUG,__METHOD__." found :". count($rv_messages['header']));
+		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' Result:'.array2string($rv_messages));
+		$messagelist = array();
+		if (!isset($rv_messages['header'])||empty($rv_messages['header'])) return $messagelist;
+		//if ($_returnModHash) $messageFolderHash = array();
 		foreach ((array)$rv_messages['header'] as $k => $vars)
 		{
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
 			$this->messages[$vars['uid']] = $vars;
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
+			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
 			if (!empty($vars['deleted'])) continue; // cut of deleted messages
 			if ($cutoffdate && $vars['date'] < $cutoffdate) continue; // message is out of range for cutoffdate, ignore it
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
-			$mess["mod"] = $vars['date'];
+			if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			$mess["mod"] = self::doFlagsMod($vars).$vars['date'];
 			$mess["id"] = $vars['uid'];
 			// 'seen' aka 'read' is the only flag we want to know about
 			$mess["flags"] = 0;
 			// outlook supports additional flags, set them to 0
-			$mess["olflags"] = 0;
 			if($vars["seen"]) $mess["flags"] = 1;
-			if($vars["flagged"]) $mess["olflags"] = 2;
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($mess));
+			if ($this->debugLevel>3); ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($mess));
 			$messagelist[$vars['uid']] = $mess;
 			unset($mess);
 		}
-
 		if ($this->debugLevel>1)
 		{
 			$endtime = microtime(true) - $gstarttime;
-			debugLog(__METHOD__. " total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__. " total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
 		}
 		return $messagelist;
 	}
 
+	/**
+	 * static function doFlagsMod
+	 * prepare headeinfo on a message to return some standardized string to tell which flags are set for a message
+	 * @param array $headerFlags  - array to process, a full return array from getHeaders
+	 * @return string string of a representation of all flags present
+	 */
+	static function doFlagsMod($headerFlags)
+	{
+		$retValue = '';
+		if (in_array('recent', $headerFlags)&&$headerFlags['recent']) $retValue.='r';
+		if (in_array('flagged', $headerFlags)&&$headerFlags['flagged']) $retValue.='f';
+		if (in_array('answered', $headerFlags)&&$headerFlags['answered']) $retValue.='a';
+		if (in_array('forwarded', $headerFlags)&&$headerFlags['forwarded']) $retValue.='w';
+		if (in_array('deleted', $headerFlags)&&$headerFlags['deleted']) $retValue.='x';
+		if (in_array('seen', $headerFlags)&&$headerFlags['seen']) $retValue.='s';
+		if (in_array('draft', $headerFlags)&&$headerFlags['draft']) $retValue.='e';
+		if (in_array('mdnsent', $headerFlags)&&$headerFlags['mdnsent']) $retValue.='m';
+		if (in_array('mdnnotsent', $headerFlags)&&$headerFlags['mdnnotsent']) $retValue.='n';
+		if (in_array('label1', $headerFlags)&&$headerFlags['label1']) $retValue.='1';
+		if (in_array('label2', $headerFlags)&&$headerFlags['label2']) $retValue.='2';
+		if (in_array('label3', $headerFlags)&&$headerFlags['label3']) $retValue.='3';
+		if (in_array('label4', $headerFlags)&&$headerFlags['label4']) $retValue.='4';
+		if (in_array('label5', $headerFlags)&&$headerFlags['label5']) $retValue.='5';
+		//error_log(__METHOD__.' ('.__LINE__.') '.$headerFlags['SUBJECT'].':'.array2string($retValue));
+		return $retValue;
+	}
+
 	/**
 	 * Search mailbox for a given pattern
 	 *
@@ -1494,7 +1551,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		//$this->debugLevel=1;
 		$searchquery=$_searchquery->GetDataArray();
 		if (!is_array($searchquery)) return array();
-		if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.array2string($searchquery));
+		if ($this->debugLevel>0) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($searchquery));
 
 		if (isset($searchquery['searchrebuildresults'])) {
 			$rebuildresults = $searchquery['searchrebuildresults'];
@@ -1545,7 +1602,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		}
 //$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
 		$rv = $this->splitID($folderid,$account,$_folderName,$id);
-		debugLog(__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' FolderID:'.$folderid.' Foldername:'.$_folderName);
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' FolderID:'.$folderid.' Foldername:'.$_folderName);
 		$this->_connect($account);
 		// this should not be needed ???
 		emailadmin_imapbase::$supportsORinQuery[self::$profileID]=true; // trigger quicksearch (if possible)
@@ -1557,7 +1614,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		//$_filter[] = array('type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
 		if ($this->debugLevel>1) debugLog (__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
 		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=($range?$start:1), $_numberOfMessages=($limit?$limit:9999999), $_sort=0, $_reverse=false, $_filter, $_id=NULL);
-		//debugLog(__METHOD__.__LINE__.array2string($rv_messages));
+		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($rv_messages));
 		$list=array();
 
 		$cnt = count($rv_messages['header']);
@@ -1573,7 +1630,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			);
 		}
 		//error_log(__METHOD__.__LINE__.array2string($list));
-		//debugLog(__METHOD__.__LINE__.array2string($list));
+		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($list));
 		return $list;
 	}
 
@@ -1597,7 +1654,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		$parent = implode($delimiter,$parent);
 
 		$id = $parent ? $this->createID($account, $parent) : '0';
-		if ($this->debugLevel>1) debugLog(__METHOD__."('$folder') --> parent=$parent --> $id");
+		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$folder') --> parent=$parent --> $id");
 		return $id;
 	}
 
@@ -1618,7 +1675,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			$this->splitID($id, $account, $folder);
 		}
 		catch(Exception $e) {
-			debugLog(__METHOD__.__LINE__.' failed for '.$e->getMessage());
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' failed for '.$e->getMessage());
 			return $folderObj=false;
 		}
 		$this->_connect($account);
@@ -1631,7 +1688,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		$folderObj->serverid = $id;
 		$folderObj->parentid = $this->getParentID($account,$folder);
 		$folderObj->displayname = $mailFolder->shortDisplayName;
-		if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
 		// get folder-type
 		foreach($this->folders as $inbox => $mailFolder) break;
 		if ($folder == $inbox)
@@ -1640,7 +1697,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		}
 		elseif($this->mail->isDraftFolder($folder, false))
 		{
-			//debugLog(__METHOD__.' isDraft');
+			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' isDraft');
 			$folderObj->type = SYNC_FOLDER_TYPE_DRAFTS;
 			$folderObj->parentid = 0; // required by devices
 		}
@@ -1660,17 +1717,17 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		}
 		elseif($this->mail->isOutbox($folder, false))
 		{
-			//debugLog(__METHOD__.' isOutbox');
+			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' isOutbox');
 			$folderObj->type = SYNC_FOLDER_TYPE_OUTBOX;
 			$folderObj->parentid = 0; // required by devices
 		}
 		else
 		{
-			//debugLog(__METHOD__.' isOther Folder'.$folder);
+			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' isOther Folder'.$folder);
 			$folderObj->type = SYNC_FOLDER_TYPE_USER_MAIL;
 		}
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
 		return $folderObj;
 	}
 
@@ -1715,24 +1772,22 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
 		if (is_numeric($account)) $type = 'mail';
+        ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": on $folderid -> $folder ($account) type: ". $type);
 		if ($type != 'mail') return false;
 
 		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
 
 		$changes = array();
-        debugLog("AlterPingChanges on $folderid ($folder) stat: ". $syncstate);
+        ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": on $folderid ($folder) stat: ". $syncstate);
         $this->mail->reopen($folder);
-//        $oldStat = $this->mail->getFolderStatus($folder);
-//error_log(__METHOD__.__LINE__.' withCache:'.array2string($oldStat));
         $status = $this->mail->getFolderStatus($folder,$ignoreStatusCache=true);
-//error_log(__METHOD__.__LINE__.' noCache:'.array2string($status));
         if (!$status) {
-            debugLog("AlterPingChanges: could not stat folder $folder ");
+            ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": could not stat folder $folder ");
             return false;
         } else {
             $syncstate = "M:". $status['messages'] ."-R:". $status['recent'] ."-U:". $status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
         }
-		debugLog(__METHOD__.' called with ('.$folderid.', ....) returning '.array2string($syncstate));
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' called with ('.$folderid.', ....) returning '.array2string($syncstate));
 		return $changes;
 	}
 
@@ -1746,7 +1801,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	{
 		$this->_connect($this->account);
 		$id = $this->createID($account=0, $this->_wasteID);
-		debugLog(__METHOD__.__LINE__."() account=$this->account returned $id for folder $this->_wasteID");
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__."() account=$this->account returned $id for folder $this->_wasteID");
 		return $id;
 	}
 
@@ -1778,7 +1833,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		// we may have to split folderid
 		$account = $folder = null;
 		$this->splitID($folderid, $account, $folder);
-		debugLog(__METHOD__.__LINE__.' '.$folderid.'->'.$folder);
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.' '.$folderid.'->'.$folder);
 		$_messageUID = (array)$id;
 
 		$this->_connect($this->account);
@@ -1790,7 +1845,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		catch (egw_exception $e)
 		{
 			$error = $e->getMessage();
-			debugLog(__METHOD__.__LINE__." $_messageUID, $folder ->".$error);
+			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__." $_messageUID, $folder ->".$error);
 			// if the server thinks the message does not exist report deletion as success
 			if (stripos($error,'[NONEXISTENT]')!==false) return true;
 			return false;
@@ -1851,7 +1906,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	 */
 	public function ChangeFolder($id, $oldid, $displayname, $type)
 	{
-		debugLog(__METHOD__."('$id', '$oldid', '$displayname', $type) NOT supported!");
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$id', '$oldid', '$displayname', $type) NOT supported!");
 		return false;
 	}
 
@@ -1866,7 +1921,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	 */
 	public function DeleteFolder($parentid, $id)
 	{
-		debugLog(__METHOD__."('$parentid', '$id') NOT supported!");
+		ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$parentid', '$id') NOT supported!");
 		return false;
 	}
 
@@ -1911,7 +1966,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 
 		$str = $this->backend->createID($account, $folder, $id);
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
 
 		return $str;
 	}
@@ -1932,7 +1987,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		// convert numeric folder-id back to folder name
 		$folder = $this->hash2folder($account,$f=$folder);
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."('$str','$account','$folder',$id)");
+		if ($this->debugLevel>1) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."('$str','$account','$folder',$id)");
 	}
 
 	/**

From 67e2ad0c1ad15099be8a96268b3629f5cfdc2c77 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 13 Oct 2015 15:07:06 +0000
Subject: [PATCH 126/130] WIP EGroupware Tutorial: - Style thumbnails inside
 the sidebox

---
 etemplate/templates/default/egw_tutorial.xet | 13 +++--
 etemplate/templates/default/etemplate2.css   | 56 +++++++++++++++++++-
 2 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/etemplate/templates/default/egw_tutorial.xet b/etemplate/templates/default/egw_tutorial.xet
index eae0e917f7..0db815b911 100644
--- a/etemplate/templates/default/egw_tutorial.xet
+++ b/etemplate/templates/default/egw_tutorial.xet
@@ -3,18 +3,25 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="etemplate.egw_tutorial" template="" lang="" group="0" version="15.1">
-		<grid id="list" class="egwGridView_grid" height="200" overflow="auto">
+		<grid id="list" width="97%" height="200" overflow="auto">
 			<columns>
 				<column/>
 			</columns>
 			<rows>
 				<row >
 					<vbox onclick="$row_cont[onclick]" align="center" statustext="$row_cont[title]">
-						<description value = "$row_cont[title]" class="et2_ellipsis"/>
-						<image src="$row_cont[thumbnail]" height="70px"/>
+						<hbox background="$row_cont[thumbnail]" height="176px" width="99%" class="egw_tutorial_thumb">
+							<description value = "$row_cont[title]" class="egw_tutorial_title"/>
+							<hbox id="play" class="egw_tutorial_playBtn">
+								<hbox></hbox>
+							</hbox>
+						</hbox>
 					</vbox>
 				</row>
 			</rows>
 		</grid>
+		<styles>
+			
+		</styles>
 	</template>
 </overlay>
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 256b6391e0..09bf4560d1 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -1975,4 +1975,58 @@ div.flash-click-to-play-dialog {
 .et2_ellipsis {
 	text-overflow: ellipsis;
 	overflow: hidden;
-}
\ No newline at end of file
+}
+
+/*egw tutorial styles - start*/
+span.egw_tutorial_title {
+    color: #FFFFFF;
+    font-weight: bold;
+    text-align: left;
+    width: 99%;
+    background-color: #434343;
+    border: 1px solid #B3B3B3;
+    padding-top: 4px;
+    padding-left: 5px;
+    border-radius: 2px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow-x: hidden;
+}
+.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn,
+.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn{
+	background-color: #434343;
+}
+.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn> div,
+.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn> div{
+	border-left-color: white;
+}
+.egw_tutorial_thumb {
+	background-repeat: no-repeat;
+	background-position: -2px;
+	border-radius: 5px;
+}
+[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn,
+#home-tutorial_play.egw_tutorial_playBtn{
+	display:block;
+	margin:20%;
+	border: 2px solid rgba(0,0,0,0.7);
+	-webkit-border-radius: 100%;
+	-moz-border-radius: 100%;
+	border-radius: 100%;
+	width: 40px;
+	height: 40px;
+	cursor: pointer;
+}
+[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn> div,
+#home-tutorial_play.egw_tutorial_playBtn>div{
+	display:block;
+	position:relative;
+	top: 10px;
+	left: 45%;
+	width: 0;
+	height: 0;
+	border-top: 10px solid transparent;
+	border-bottom: 10px solid transparent;
+	border-left: 10px solid rgba(0,0,0,0.8);
+}
+/*egw tutorial styles - end*/
\ No newline at end of file

From ea0f039a37d9ce9ce9f70a42b85506e73a1c0bdc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 13 Oct 2015 16:15:32 +0000
Subject: [PATCH 127/130] fix PHP Fatal error, replace utf8_truncate -->
 Utils::Utf8_truncate

---
 mail/inc/class.mail_zpush.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail/inc/class.mail_zpush.inc.php b/mail/inc/class.mail_zpush.inc.php
index b4873aeb56..ddb7e3f0e9 100644
--- a/mail/inc/class.mail_zpush.inc.php
+++ b/mail/inc/class.mail_zpush.inc.php
@@ -942,7 +942,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 				// remove all other html
 				$body = strip_tags($raw_body);
 				if(strlen($body) > $truncsize) {
-					$body = utf8_truncate($body, $truncsize);
+					$body = Utils::Utf8_truncate($body, $truncsize);
 					$output->bodytruncated = 1;
 				}
 				else
@@ -1053,7 +1053,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 
 					if(isset($truncsize) && strlen($htmlbody) > $truncsize)
 					{
-						$htmlbody = utf8_truncate($htmlbody,$truncsize);
+						$htmlbody = Utils::Utf8_truncate($htmlbody,$truncsize);
 						$output->asbody->truncated = 1;
 					}
 					$output->asbody->data = $htmlbody;
@@ -1074,7 +1074,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 					if(isset($truncsize) &&
 			    		strlen($plainBody) > $truncsize)
 					{
-						$plainBody = utf8_truncate($plainBody, $truncsize);
+						$plainBody = Utils::Utf8_truncate($plainBody, $truncsize);
 						$output->asbody->truncated = 1;
 					}
 					$output->asbody->data = $plainBody;

From 025550402a613eb0b7c5427d27431cd1591649bd Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 13 Oct 2015 20:43:49 +0000
Subject: [PATCH 128/130] Fix expandable selectbox button missing icon

---
 etemplate/js/et2_widget_selectbox.js       | 16 +++++++++++++++-
 etemplate/templates/default/etemplate2.css |  3 ++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js
index a98060b9f1..3aca8020dd 100644
--- a/etemplate/js/et2_widget_selectbox.js
+++ b/etemplate/js/et2_widget_selectbox.js
@@ -213,6 +213,17 @@ var et2_selectbox = et2_inputWidget.extend(
 					this._appendOptionElement('', this.options.empty_label);
 				}
 			}
+			if(this.expand_button)
+			{
+				if(_multiple)
+				{
+					this.expand_button.addClass('ui-icon-minus').removeClass('ui-icon-plus');
+				}
+				else
+				{
+					this.expand_button.removeClass('ui-icon-minus').addClass('ui-icon-plus');
+				}
+			}
 		}
 	},
 
@@ -571,15 +582,18 @@ var et2_selectbox = et2_inputWidget.extend(
 			if (!this.expand_button)
 			{
 				var button_id = this.getInstanceManager().uniqueId+'_'+this.id.replace(/\./g, '-') + "_expand";
-				this.expand_button = $j("<button class='et2_button et2_button_icon et2_selectbox_expand' id='" + button_id + "'/>")
+				this.expand_button = $j("<button class='et2_button et2_button_icon et2_selectbox_expand ui-icon' id='" + button_id + "'/>")
+					.addClass(this.options.multiple ? 'ui-icon-minus' : 'ui-icon-plus')
 					.on("click", jQuery.proxy(function(e) {
 						if(typeof this.input.attr('size') !== 'undefined' && this.input.attr('size') != 1)
 						{
 							this.set_multiple(false, 1);
+							this.expand_button.removeClass('ui-icon-minus').addClass('ui-icon-plus');
 						}
 						else
 						{
 							this.set_multiple(true, this.options.expand_multiple_rows);
+							this.expand_button.addClass('ui-icon-minus').removeClass('ui-icon-plus');
 						}
 					},this));
 			}
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 09bf4560d1..16979dc79d 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -207,7 +207,7 @@ input[type=button] {
 }
 .et2_button_icon {
   border: none;
-  background: transparent;
+  background-color: transparent;
   padding: 0px;
 }
 button.et2_button_text:hover,
@@ -304,6 +304,7 @@ button#cancel {
  */
 .et2_selectbox_expand {
   width: 16px;
+  display: inline-block;
 }
 .et2_selectbox .ui-widget-header {
   padding: 0px 6px 0px 6px;

From 375cf22ba63a881ae6e1642329a534ae764b4144 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 13 Oct 2015 21:12:02 +0000
Subject: [PATCH 129/130] fix flags to only contain AS supported flags analog
 to Zimbra code and seek stream of attachments to beginning, as z-push
 requires that

---
 mail/inc/class.mail_zpush.inc.php | 37 +++++++++++++------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/mail/inc/class.mail_zpush.inc.php b/mail/inc/class.mail_zpush.inc.php
index ddb7e3f0e9..933ff4568f 100644
--- a/mail/inc/class.mail_zpush.inc.php
+++ b/mail/inc/class.mail_zpush.inc.php
@@ -1279,6 +1279,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		$this->mail->reopen($folder);
 		$attachment = $this->mail->getAttachment($id,$part,0,false,true,$folder);
         $SIOattachment = new SyncItemOperationsAttachment();
+		fseek($attachment['attachment'], 0, SEEK_SET);	// z-push requires stream seeked to start
         $SIOattachment->data = $attachment['attachment'];
 		//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.": $fid (attname: '$attname') Data:".$attachment['attachment']);
         if (isset($attachment['type']) )
@@ -1311,6 +1312,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		$this->mail->reopen($folder);
 		$attachment = $this->mail->getAttachment($id,$part,0,false,true,$folder);
         $SIOattachment = new SyncItemOperationsAttachment();
+		fseek($attachment['attachment'], 0, SEEK_SET);	// z-push requires stream seeked to start
         $SIOattachment->data = $attachment['attachment'];
         if (isset($attachment['type']) )
             $SIOattachment->contenttype = $attachment['type'];
@@ -1484,7 +1486,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			$mess["flags"] = 0;
 			// outlook supports additional flags, set them to 0
 			if($vars["seen"]) $mess["flags"] = 1;
-			if ($this->debugLevel>3); ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($mess));
+			if ($this->debugLevel>3) ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.__LINE__.array2string($mess));
 			$messagelist[$vars['uid']] = $mess;
 			unset($mess);
 		}
@@ -1497,30 +1499,23 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 	}
 
 	/**
-	 * static function doFlagsMod
-	 * prepare headeinfo on a message to return some standardized string to tell which flags are set for a message
+	 * Prepare headeinfo on a message to return some standardized string to tell which flags are set for a message
+	 *
+	 * AS currently only supports flagged, answered/replied and forwarded flags.
+	 * Seen/read is in under flags key of stat!
+	 *
 	 * @param array $headerFlags  - array to process, a full return array from getHeaders
-	 * @return string string of a representation of all flags present
+	 * @link https://sourceforge.net/p/zimbrabackend/code/HEAD/tree/zimbra-backend/branches/z-push-2/zimbra.php#l11652
+	 * @return string string of a representation of supported flags
 	 */
 	static function doFlagsMod($headerFlags)
 	{
-		$retValue = '';
-		if (in_array('recent', $headerFlags)&&$headerFlags['recent']) $retValue.='r';
-		if (in_array('flagged', $headerFlags)&&$headerFlags['flagged']) $retValue.='f';
-		if (in_array('answered', $headerFlags)&&$headerFlags['answered']) $retValue.='a';
-		if (in_array('forwarded', $headerFlags)&&$headerFlags['forwarded']) $retValue.='w';
-		if (in_array('deleted', $headerFlags)&&$headerFlags['deleted']) $retValue.='x';
-		if (in_array('seen', $headerFlags)&&$headerFlags['seen']) $retValue.='s';
-		if (in_array('draft', $headerFlags)&&$headerFlags['draft']) $retValue.='e';
-		if (in_array('mdnsent', $headerFlags)&&$headerFlags['mdnsent']) $retValue.='m';
-		if (in_array('mdnnotsent', $headerFlags)&&$headerFlags['mdnnotsent']) $retValue.='n';
-		if (in_array('label1', $headerFlags)&&$headerFlags['label1']) $retValue.='1';
-		if (in_array('label2', $headerFlags)&&$headerFlags['label2']) $retValue.='2';
-		if (in_array('label3', $headerFlags)&&$headerFlags['label3']) $retValue.='3';
-		if (in_array('label4', $headerFlags)&&$headerFlags['label4']) $retValue.='4';
-		if (in_array('label5', $headerFlags)&&$headerFlags['label5']) $retValue.='5';
-		//error_log(__METHOD__.' ('.__LINE__.') '.$headerFlags['SUBJECT'].':'.array2string($retValue));
-		return $retValue;
+		$flags = 'nnn';
+		if ($headerFlags['flagged']) $flags[0] = 'f';
+		if ($headerFlags['answered']) $flags[1] = 'a';
+		if ($headerFlags['forwarded']) $flags[2] = 'f';
+		//ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($headerFlags).') returning '.array2string($flags));
+		return $flags;
 	}
 
 	/**

From 04a8cd4f604d39140532da84320b4ec6bea15075 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 14 Oct 2015 14:17:09 +0000
Subject: [PATCH 130/130] WIP EGroupware Tutorial: - Implement video navigation
 on popup - Implement introduction video with user confirmation dialog based
 on session - New layout for tutorials list both in sidebar and popup -
 Separate tutorials styles to be able to set different styles base on
 templates

---
 etemplate/templates/default/egw_tutorial.xet  |  7 +-
 etemplate/templates/default/etemplate2.css    | 53 ----------
 home/inc/class.home_tutorial_ui.inc.php       | 97 ++++++++++---------
 home/js/app.js                                | 33 +------
 home/templates/default/tutorial.xet           | 39 +++++---
 phpgwapi/inc/class.hooks.inc.php              |  2 +-
 phpgwapi/js/framework/fw_browser.js           | 27 +++++-
 phpgwapi/js/jsapi/app_base.js                 |  8 +-
 phpgwapi/templates/default/def_tutorials.less | 92 ++++++++++++++++++
 pixelegg/css/mobile.css                       | 40 ++++++--
 pixelegg/css/pixelegg.css                     | 38 +++++++-
 pixelegg/less/layout_definitions.less         |  1 +
 pixelegg/less/layout_raster_sidebar.less      |  1 +
 pixelegg/less/layout_tutorials.less           | 31 ++++++
 14 files changed, 304 insertions(+), 165 deletions(-)
 create mode 100644 phpgwapi/templates/default/def_tutorials.less
 create mode 100644 pixelegg/less/layout_tutorials.less

diff --git a/etemplate/templates/default/egw_tutorial.xet b/etemplate/templates/default/egw_tutorial.xet
index 0db815b911..5a655a9a5b 100644
--- a/etemplate/templates/default/egw_tutorial.xet
+++ b/etemplate/templates/default/egw_tutorial.xet
@@ -3,14 +3,14 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="etemplate.egw_tutorial" template="" lang="" group="0" version="15.1">
-		<grid id="list" width="97%" height="200" overflow="auto">
+		<grid id="list" width="99%" height="200" overflow="auto">
 			<columns>
 				<column/>
 			</columns>
 			<rows>
 				<row >
 					<vbox onclick="$row_cont[onclick]" align="center" statustext="$row_cont[title]">
-						<hbox background="$row_cont[thumbnail]" height="176px" width="99%" class="egw_tutorial_thumb">
+						<hbox background="$row_cont[thumbnail]" height="130px" width="99%" class="egw_tutorial_thumb">
 							<description value = "$row_cont[title]" class="egw_tutorial_title"/>
 							<hbox id="play" class="egw_tutorial_playBtn">
 								<hbox></hbox>
@@ -20,8 +20,5 @@
 				</row>
 			</rows>
 		</grid>
-		<styles>
-			
-		</styles>
 	</template>
 </overlay>
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 16979dc79d..b38ba1e0fb 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -1978,56 +1978,3 @@ div.flash-click-to-play-dialog {
 	overflow: hidden;
 }
 
-/*egw tutorial styles - start*/
-span.egw_tutorial_title {
-    color: #FFFFFF;
-    font-weight: bold;
-    text-align: left;
-    width: 99%;
-    background-color: #434343;
-    border: 1px solid #B3B3B3;
-    padding-top: 4px;
-    padding-left: 5px;
-    border-radius: 2px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow-x: hidden;
-}
-.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn,
-.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn{
-	background-color: #434343;
-}
-.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn> div,
-.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn> div{
-	border-left-color: white;
-}
-.egw_tutorial_thumb {
-	background-repeat: no-repeat;
-	background-position: -2px;
-	border-radius: 5px;
-}
-[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn,
-#home-tutorial_play.egw_tutorial_playBtn{
-	display:block;
-	margin:20%;
-	border: 2px solid rgba(0,0,0,0.7);
-	-webkit-border-radius: 100%;
-	-moz-border-radius: 100%;
-	border-radius: 100%;
-	width: 40px;
-	height: 40px;
-	cursor: pointer;
-}
-[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn> div,
-#home-tutorial_play.egw_tutorial_playBtn>div{
-	display:block;
-	position:relative;
-	top: 10px;
-	left: 45%;
-	width: 0;
-	height: 0;
-	border-top: 10px solid transparent;
-	border-bottom: 10px solid transparent;
-	border-left: 10px solid rgba(0,0,0,0.8);
-}
-/*egw tutorial styles - end*/
\ No newline at end of file
diff --git a/home/inc/class.home_tutorial_ui.inc.php b/home/inc/class.home_tutorial_ui.inc.php
index fb16226a87..f9a0eef854 100644
--- a/home/inc/class.home_tutorial_ui.inc.php
+++ b/home/inc/class.home_tutorial_ui.inc.php
@@ -31,62 +31,67 @@ class home_tutorial_ui {
 		egw_framework::csp_frame_src_attrs(array('www.youtube.com'));
 		
 		$tmpl = new etemplate_new('home.tutorial');
-		
-		// Get tutorial object id
-		$tuid_indx = explode('-',$_GET['tuid']);
 		if (!is_array($content))
 		{
-			// read tutorials json file to fetch data
-			$tutorials = json_decode(self::getJsonData(), true);
-			$apps = array('introduction' => lang('Introduction'));
-			foreach ($tutorials as $app => $val)
-			{
-				// show only apps user has access to them
-				if (in_array($app, array_keys($GLOBALS['egw_info']['user']['apps']))) $apps [$app] = $app;
-			}
-			$sel_options = array(
-				'apps' => $apps,
+			// Get tutorial object id
+			$tuid_indx = explode('-',$_GET['tuid']);
+			$appName = $tuid_indx[0];
+			$lang = $tuid_indx[1];
+			$id = $tuid_indx[2];
+		}
+		else // set the first video of selected app
+		{
+			$appName = $content['list']['apps'];
+			$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
+			$id ="0";
+		}
+		// read tutorials json file to fetch data
+		$tutorials = json_decode(self::getJsonData(), true);
+		$apps = array('introduction' => lang('Introduction'));
+		foreach ($tutorials as $app => $val)
+		{
+			// show only apps user has access to them
+			if (in_array($app, array_keys($GLOBALS['egw_info']['user']['apps']))) $apps [$app] = $app;
+		}
+		$sel_options = array(
+			'apps' => $apps,
+		);
+		// Check if the user has right to see the app's tutorial
+		if (in_array($appName, array_keys($GLOBALS['egw_info']['user']['apps'])) || $appName === "introduction")
+		{
+			// fallback to english video
+			$tutorial = $tutorials[$appName][$lang][$id]? $tutorials[$appName][$lang][$id]:
+				$tutorials[$appName]['en'][$id];
+
+			$list = array(
+				'apps' => $appName,
+				'0' => ''
 			);
-			// Check if the user has right to see the app's tutorial
-			if (in_array($tuid_indx[0], array_keys($GLOBALS['egw_info']['user']['apps'])) || $tuid_indx[0] === "introduction")
+			foreach ($tutorials[$appName][$lang] as $v)
 			{
-				// fallback to english video
-				$tutorial = $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]? $tutorials[$tuid_indx[0]][$tuid_indx[1]][$tuid_indx[2]]:
-					$tutorials[$tuid_indx[0]]['en'][$tuid_indx[2]];
-				
-				$content = array (
-					'src' => $tutorial['src'],
-					'title' => $tutorial['title']
-				);
-			}
-			else
-			{
-				$content = array();
-				egw_framework::message(lang('You do not have permission to see this tutorial!'));
-			}
-			// If its the autoloading tutorial
-			if ($tuid_indx[3] === 'a')
-			{
-				$content ['discardbox'] = true;
+				$v ['onclick'] = 'app.home.tutorial_videoOnClick("'.$v['src'].'")';
+				array_push($list, $v);
 			}
+			$content = array (
+				'src' => $tutorial['src'],
+				'title' => $tutorial['title'],
+				'list' => $list
+			);
+		}
+		else
+		{
+			$content = array();
+			egw_framework::message(lang('You do not have permission to see this tutorial!'));
+		}
+		// If its the autoloading tutorial
+		if ($tuid_indx[3] === 'a')
+		{
+			$content ['discardbox'] = true;
 		}
 				
 		$tmpl->exec('home.home_tutorial_ui.popup', $content,$sel_options,array(),array(),array(),2);
 	}
 	
-	/**
-	 * Ajax function to retrive selected app's tutorials based on prefered user lang
-	 *
-	 * @param type $_app application name
-	 */
-	function ajax_getAppsTutorials($_app)
-	{
-		$tutorials = json_decode(self::getJsonData(), true);
-		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
-		$response = egw_json_response::get();
-		$response->data($tutorials[$_app][$lang]?$tutorials[$_app][$lang]:$tutorials[$_app]['en']);
-	}
-	
 	/**
 	 * Ajax function to get videos links as json
 	 */
diff --git a/home/js/app.js b/home/js/app.js
index ef11669748..8b011634e4 100644
--- a/home/js/app.js
+++ b/home/js/app.js
@@ -748,43 +748,18 @@ app.classes.home = AppJS.extend(
 		nm.resize();
 	},
 	
-	/**
-	 * Function to set apps and tutorials selectboxes values
-	 * 
-	 * @param {type} egw
-	 * @param {type} widget apps selectbox widget
-	 */
-	tutorial_appChange: function (egw, widget) {
-		var tutorials = etemplate2.getByApplication('home')[0].widgetContainer.getWidgetById('tutorials');
-		var sel_options = {};
-		if (widget)
-		{
-			this.egw.json('home.home_tutorial_ui.ajax_getAppsTutorials', [widget.get_value()], function(_data){
-				if(_data && tutorials)
-				{
-					for (var i=0;i<_data.length;i++)
-					{
-						sel_options[i] = {label:_data[i].title, value:_data[i].src};
-					}
-					tutorials.set_select_options(sel_options);
-				}
-			}).sendRequest();
-		}
-	},
-	
 	/**
 	 * Function to set video iframe base on selected tutorial from
-	 * tutorials selectbox
+	 * tutorials box
 	 * 
-	 * @param {type} egw
-	 * @param {type} widget tutorials selectbox
+	 * @param {type} url
 	 */
-	tutorial_tutorialsChange: function (egw, widget)
+	tutorial_videoOnClick: function (_url)
 	{
 		var frame = etemplate2.getByApplication('home')[0].widgetContainer.getWidgetById('src');
 		if (frame)
 		{
-			frame.set_value(widget.get_value());
+			frame.set_value(_url);
 		}
 	},
 	
diff --git a/home/templates/default/tutorial.xet b/home/templates/default/tutorial.xet
index 9c3217ff9c..1e284467ce 100644
--- a/home/templates/default/tutorial.xet
+++ b/home/templates/default/tutorial.xet
@@ -3,22 +3,35 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="home.tutorial" template="" lang="" group="0" version="15.1">
-		<hbox height="87%">
-			<iframe id="src" height="100%" width="100%" seamless="true" fullscreen="true"/>
+		<hbox height="87%" class="tutorial_popup">
+			<hbox class="tutorial_videoList">
+				<grid id="list" classs="egwGridView_grid" resize_ratio="0" width="190px">
+					<columns>
+						<column/>
+					</columns>
+					<rows>
+						<row class="th" part="header">
+							<menulist>
+								<menupopup id="apps" label="Applications" statustext="Please select application name" onchange="1"/>
+							</menulist>
+						</row>
+						<row>
+							<vbox onclick="$row_cont[onclick]" align="center" statustext="$row_cont[title]">
+								<hbox background="$row_cont[thumbnail]" height="130px" width="98%" class="egw_tutorial_thumb">
+									<description value = "$row_cont[title]" class="egw_tutorial_title"/>
+									<hbox id="play" class="egw_tutorial_playBtn">
+										<hbox></hbox>
+									</hbox>
+								</hbox>
+							</vbox>
+						</row>
+					</rows>
+				</grid>
+			</hbox>
+			<iframe id="src" height="100%" seamless="true" width="73%" fullscreen="true"/>
 		</hbox>
 		<hbox class="dialogFooterToolbar">
 			<button  align="left" statustext="Close this window" label="Close" id="button[close]" onclick="window.close()" image="close" background_image="1"/>
-			<hbox disabled="@discardbox">
-				<menulist>
-					<menupopup id="apps" label="Applications" statustext="Please select application name" onchange="app.home.tutorial_appChange"/>
-				</menulist>
-				<menulist>
-					<menupopup id="tutorials" label="Tutorilas" statustext="Please select a tutorial" onchange="app.home.tutorial_tutorialsChange"/>
-				</menulist>
-			</hbox>
-			<hbox disabled="!@discardbox" class="discard_checkbox">
-				<checkbox id="checkbox" label="Do not show this video next time" onchange="app.home.tutorial_autoloadDiscard"/>
-			</hbox>
 		</hbox>
 	</template>
 </overlay>
diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index df98706e02..e86e168155 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -398,7 +398,7 @@ class hooks
 				),
 				'menuOpened'  => true
 			);
-			display_sidebox($appname, lang('EGroupware Tutorial'), $file);
+			display_sidebox($appname, lang('Video Tutorials'), $file);
 		}
 	}
 }
diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js
index 86eb520405..bebb80b9f9 100644
--- a/phpgwapi/js/framework/fw_browser.js
+++ b/phpgwapi/js/framework/fw_browser.js
@@ -175,10 +175,31 @@ var fw_browser =  Class.extend({
 			
 			// Open tutorial popup with an introduction video about egroupware
 			// the popup can be discarded for the next time show if user
-			// check the discard checkbox
-			if (!egw.preference('egw_tutorial_autoload', 'common'))
+			// select "Never" or can select "Later" and the introduction
+			// dialog will show upon the next session refresh
+			if (!egw.preference('egw_tutorial_noautoload', 'common') && !sessionStorage.getItem('egw_tutorial_visited'))
 			{
-				egw.open_link(egw.link('/index.php', 'menuaction=home.home_tutorial_ui.popup&tuid=introduction-'+egw.preference('lang')+'-0-a'),'_blank','750x580');
+				sessionStorage.setItem('egw_tutorial_visited', true);
+				var buttons = [
+					{text:"Show", id:"show", default:"true"},
+					{text:"Later", id:"later"},
+					{text:"Never", id:"never"}
+				];
+				et2_dialog.show_dialog(function (_button_id)
+				{
+					if (_button_id == "show" )
+					{
+						egw.open_link(egw.link('/index.php', 'menuaction=home.home_tutorial_ui.popup&tuid=introduction-'+egw.preference('lang')+'-0-a'),'_blank','750x580');
+					}
+					else if(_button_id == "never")
+					{
+						egw.set_preference('common', 'egw_tutorial_noautoload',true);
+					}
+				},
+				egw.lang('We would like to introduce you to EGroupware by showing a short introduction video.'),
+				egw.lang('Introduction'),
+				{}, buttons, et2_dialog.QUESTION_MESSAGE, undefined, egw);
+				
 			}
 		});
 
diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index a2319c66f7..8d179c340e 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -997,12 +997,12 @@ var AppJS = Class.extend(
 	 *		{
 	 *			"mail":{
 	 *				"en":[
-	 *					{src:"https://www.youtube.com/embed/mCDJndpjO40", thumbnail:"http://img.youtube.com/vi/mCDJndpjO40/1.jpg", "title":"PGP Encryption"},
-	 *					{src:"https://www.youtube.com/embed/mCDJndpjO", thumbnail:"http://img.youtube.com/vi/mCDJndpjO/1.jpg", "title":"Subscription", top:true},
+	 *					{src:"https://www.youtube.com/embed/mCDJndpjO40", thumbnail:"http://img.youtube.com/vi/mCDJndpjO40/0.jpg", "title":"PGP Encryption"},
+	 *					{src:"https://www.youtube.com/embed/mCDJndpjO", thumbnail:"http://img.youtube.com/vi/mCDJndpjO/0.jpg", "title":"Subscription", top:true},
 	 *				],
 	 *				"de":[
-	 *					{src:"https://www.youtube.com/embed/m40", thumbnail:"http://img.youtube.com/vi/m40/1.jpg", "title":"PGP Verschlüsselung"},
-	 *					{src:"https://www.youtube.com/embed/mpjO", thumbnail:"http://img.youtube.com/vi/mpjO/1.jpg", "title":"Ordner Abonnieren", top:true},
+	 *					{src:"https://www.youtube.com/embed/m40", thumbnail:"http://img.youtube.com/vi/m40/0.jpg", "title":"PGP Verschlüsselung"},
+	 *					{src:"https://www.youtube.com/embed/mpjO", thumbnail:"http://img.youtube.com/vi/mpjO/0.jpg", "title":"Ordner Abonnieren", top:true},
 	 *				]
 	 *			}
 	 *		}
diff --git a/phpgwapi/templates/default/def_tutorials.less b/phpgwapi/templates/default/def_tutorials.less
new file mode 100644
index 0000000000..2634d1ef6f
--- /dev/null
+++ b/phpgwapi/templates/default/def_tutorials.less
@@ -0,0 +1,92 @@
+/**
+ * EGroupware: CSS with less preprocessor
+ *
+ * Definitions for tutorials
+ *
+ * Please do NOT change css-files directly, instead change less-files and compile them!
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Hadi NAtegh <hn@stylite.de>
+ * @package phpgwapi
+ * @version $Id$
+ */
+
+span.egw_tutorial_title {
+    color: black;
+    font-weight: bold;
+    text-align: left;
+    width: 95%;
+    background-color: #D6DEF0;
+    border: 1px solid #B3B3B3;
+    padding-top: 4px;
+    padding-left: 5px;
+    border-radius: 2px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow-x: hidden;
+}
+.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn,
+.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn{
+	background-color: #FF0000;
+	opacity: 0.68;
+}
+.egw_tutorial_thumb:hover [id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn> div,
+.egw_tutorial_thumb:hover #home-tutorial_play.egw_tutorial_playBtn> div{
+	border-left-color: white;
+}
+.egw_tutorial_thumb {
+	background-repeat: no-repeat;
+	background-position: -2px;
+	border-radius: 5px;
+}
+[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn,
+#home-tutorial_play.egw_tutorial_playBtn{
+	display:block;
+	margin:10%;
+	border: 2px solid rgba(0,0,0,0.7);
+	-webkit-border-radius: 100%;
+	-moz-border-radius: 100%;
+	border-radius: 100%;
+	width: 40px;
+	height: 40px;
+	cursor: pointer;
+}
+[id^="egw_tutorial_"][id$="_play"].egw_tutorial_playBtn> div,
+#home-tutorial_play.egw_tutorial_playBtn>div{
+	display:block;
+	position:relative;
+	top: 10px;
+	left: 45%;
+	width: 0;
+	height: 0;
+	border-top: 10px solid transparent;
+	border-bottom: 10px solid transparent;
+	border-left: 10px solid rgba(0,0,0,0.8);
+}
+[id^="egw_tutorial_"][id$="sidebox_list"] {
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+
+
+#home-tutorial_list {
+	float:left;
+	.egw_tutorial_thumb {
+		display:block;
+	}
+}
+#home-tutorial_src {
+	border-left: 6px solid #E0E0E0;
+}
+.tutorial_popup {
+	background-color:white;
+	padding-top: 5px;
+	overflow-y: hidden;
+}
+.tutorial_videoList {
+	overflow-x: hidden;
+	overflow-y: auto;
+	height: 100%;
+	display: inline-block !important;
+}
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 1e7b97def3..8fb7ec26da 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -47,6 +47,7 @@
  * Stefan Reinhardt
  */
 /*@import (less) "../../etemplate/templates/default/etemplate2.css";*/
+@import "../../phpgwapi/templates/default/def_tutorials.css";
 @media all {
   /**
  * Top level
@@ -2196,7 +2197,6 @@ body {
  * @package pixelegg
  * @version $Id$
  */
-@import-once "def_colors.less";
 #socialMedia {
   position: relative;
   bottom: 20px;
@@ -4274,7 +4274,7 @@ td.message span.message {
   text-decoration: none;
   height: 32px;
   /*font-size: 1.1em;*/
-  font-size: 12.100000000000001px;
+  font-size: 12.1px;
   line-height: 1.5em;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
@@ -4298,7 +4298,7 @@ td.message span.message {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before {
   padding-right: 20px;
-  font-size: 12.100000000000001px;
+  font-size: 12.1px;
   content: " ";
   background-image: url(../images/topmenu_items/home.png);
   background-repeat: no-repeat;
@@ -4694,7 +4694,7 @@ td.message span.message {
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
-  font-size: 12.100000000000001px;
+  font-size: 12.1px;
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
@@ -4866,7 +4866,7 @@ td.message span.message {
   margin: 5px 0px 3px 5px;
   padding: 0px 0px 0px 15px;
   line-height: 1em;
-  font-size: 12.100000000000001px;
+  font-size: 12.1px;
   background-image: url(../images/arrow_left.png);
   background-repeat: no-repeat;
   background-position: left center;
@@ -5126,6 +5126,7 @@ td.message span.message {
 }
 .egw_fw_ui_category_content .egwTutorial div#list_grid_wrapper {
   border-bottom-left-radius: 10px;
+  overflow-x: hidden;
 }
 .egw_fw_ui_category_content .egwTutorial div#list_grid_wrapper .et2_label {
   padding-bottom: 5px;
@@ -6354,6 +6355,33 @@ a.textSidebox {
 .pageGenTime > span:last-child:after {
   content: "";
 }
+/**
+ * EGroupware: Pixelegg styles
+ *
+ * Pixelegg definitions for tutorials
+ *
+ * Please do NOT change css-files directly, instead change less-files and compile them!
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Hadi NAtegh <hn@stylite.de>
+ * @package phpgwapi
+ * @version $Id$
+ */
+span.egw_tutorial_title {
+  color: #FFFFFF;
+  font-weight: bold;
+  text-align: left;
+  width: 95%;
+  background-color: #434343;
+  border: 1px solid #B3B3B3;
+  padding-top: 4px;
+  padding-left: 5px;
+  border-radius: 2px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow-x: hidden;
+}
 /*@import "../less/layout_buttons_global.less";*/
 /*@import "../less/layout_chosen.less";*/
 /*@import "../less/layout_messages.less";*/
@@ -6926,7 +6954,7 @@ a.textSidebox {
     margin: 5px 0px 3px 5px;
     padding: 0px 0px 0px 15px;
     line-height: 1em;
-    font-size: 12.100000000000001px;
+    font-size: 12.1px;
     background-image: url(../images/arrow_left.png);
     background-repeat: no-repeat;
     background-position: left center;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 5d350d80f5..0c9e2eb4c5 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -36,6 +36,7 @@
  * Stefan Reinhardt
  */
 /*@import (less) "../../etemplate/templates/default/etemplate2.css";*/
+@import "../../phpgwapi/templates/default/def_tutorials.css";
 @media all {
   /**
  * Top level
@@ -2185,7 +2186,6 @@ body {
  * @package pixelegg
  * @version $Id$
  */
-@import-once "def_colors.less";
 #socialMedia {
   position: relative;
   bottom: 20px;
@@ -4263,7 +4263,7 @@ td.message span.message {
   text-decoration: none;
   height: 32px;
   /*font-size: 1.1em;*/
-  font-size: 12.100000000000001px;
+  font-size: 12.1px;
   line-height: 1.5em;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
@@ -4287,7 +4287,7 @@ td.message span.message {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before {
   padding-right: 20px;
-  font-size: 12.100000000000001px;
+  font-size: 12.1px;
   content: " ";
   background-image: url(../images/topmenu_items/home.png);
   background-repeat: no-repeat;
@@ -4683,7 +4683,7 @@ td.message span.message {
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
-  font-size: 12.100000000000001px;
+  font-size: 12.1px;
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
@@ -4855,7 +4855,7 @@ td.message span.message {
   margin: 5px 0px 3px 5px;
   padding: 0px 0px 0px 15px;
   line-height: 1em;
-  font-size: 12.100000000000001px;
+  font-size: 12.1px;
   background-image: url(../images/arrow_left.png);
   background-repeat: no-repeat;
   background-position: left center;
@@ -5115,6 +5115,7 @@ td.message span.message {
 }
 .egw_fw_ui_category_content .egwTutorial div#list_grid_wrapper {
   border-bottom-left-radius: 10px;
+  overflow-x: hidden;
 }
 .egw_fw_ui_category_content .egwTutorial div#list_grid_wrapper .et2_label {
   padding-bottom: 5px;
@@ -6343,6 +6344,33 @@ a.textSidebox {
 .pageGenTime > span:last-child:after {
   content: "";
 }
+/**
+ * EGroupware: Pixelegg styles
+ *
+ * Pixelegg definitions for tutorials
+ *
+ * Please do NOT change css-files directly, instead change less-files and compile them!
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Hadi NAtegh <hn@stylite.de>
+ * @package phpgwapi
+ * @version $Id$
+ */
+span.egw_tutorial_title {
+  color: #FFFFFF;
+  font-weight: bold;
+  text-align: left;
+  width: 95%;
+  background-color: #434343;
+  border: 1px solid #B3B3B3;
+  padding-top: 4px;
+  padding-left: 5px;
+  border-radius: 2px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow-x: hidden;
+}
 /*@import "../less/layout_buttons_global.less";*/
 /*@import "../less/layout_chosen.less";*/
 /*@import "../less/layout_messages.less";*/
diff --git a/pixelegg/less/layout_definitions.less b/pixelegg/less/layout_definitions.less
index 1eff3da4d4..afa82fa758 100644
--- a/pixelegg/less/layout_definitions.less
+++ b/pixelegg/less/layout_definitions.less
@@ -69,4 +69,5 @@
 
 @import "layout_traditional.less";
 
+@import "layout_tutorials.less";
 
diff --git a/pixelegg/less/layout_raster_sidebar.less b/pixelegg/less/layout_raster_sidebar.less
index 06d78f400d..18023e336d 100644
--- a/pixelegg/less/layout_raster_sidebar.less
+++ b/pixelegg/less/layout_raster_sidebar.less
@@ -523,6 +523,7 @@
 
 	.egwTutorial div#list_grid_wrapper {
 		border-bottom-left-radius: 10px;
+		overflow-x:hidden;
 		.et2_label {
 			padding-bottom: 5px;
 		}
diff --git a/pixelegg/less/layout_tutorials.less b/pixelegg/less/layout_tutorials.less
new file mode 100644
index 0000000000..fcfab31a10
--- /dev/null
+++ b/pixelegg/less/layout_tutorials.less
@@ -0,0 +1,31 @@
+/**
+ * EGroupware: Pixelegg styles
+ *
+ * Pixelegg definitions for tutorials
+ *
+ * Please do NOT change css-files directly, instead change less-files and compile them!
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Hadi NAtegh <hn@stylite.de>
+ * @package phpgwapi
+ * @version $Id$
+ */
+@import (reference) "definitions.less";
+@import "../../phpgwapi/templates/default/def_tutorials.css";
+
+span.egw_tutorial_title {
+    color: #FFFFFF;
+    font-weight: bold;
+    text-align: left;
+    width: 95%;
+    background-color: #434343;
+    border: 1px solid #B3B3B3;
+    padding-top: 4px;
+    padding-left: 5px;
+    border-radius: 2px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow-x: hidden;
+}
+