From 94a8b6e87b507508c33536a4a1297961e6e06462 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 29 Oct 2014 11:07:35 +0000
Subject: [PATCH 01/44] Get taglist working properly again with updated
 magicsuggest

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

diff --git a/etemplate/js/et2_widget_taglist.js b/etemplate/js/et2_widget_taglist.js
index 17e143957f..f45faed1d5 100644
--- a/etemplate/js/et2_widget_taglist.js
+++ b/etemplate/js/et2_widget_taglist.js
@@ -14,7 +14,7 @@
 
 /*egw:uses
 	et2_core_inputWidget;
-	/phpgwapi/js/jquery/magicsuggest/src/magicsuggest-1.3.1.js;
+	/phpgwapi/js/jquery/magicsuggest/magicsuggest.js;
 */
 
 /**
@@ -602,4 +602,4 @@ et2_register_widget(et2_taglist_ro, ["taglist_ro","taglist_email_ro", "taglist_a
 
 // Require css
 // TODO: merge into etemplate2.css with all other widgets when done
-if(typeof egw != 'undefined') egw(window).includeCSS(egw.webserverUrl + "/phpgwapi/js/jquery/magicsuggest/src/magicsuggest-1.3.1.css");
+if(typeof egw != 'undefined') egw(window).includeCSS(egw.webserverUrl + "/phpgwapi/js/jquery/magicsuggest/magicsuggest.css");
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index a53c9fd8c1..9a4998bfde 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -6,7 +6,7 @@
 /**
  * Magic suggest / tag list widget
  */
-@import url("../../../phpgwapi/js/jquery/magicsuggest/src/magicsuggest-1.3.1.css");
+@import url("../../../phpgwapi/js/jquery/magicsuggest/magicsuggest.css");
 
 
 /**

From e47d4e1dd025f1138fb3e20bca8200a5fd6797eb Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Oct 2014 12:27:44 +0000
Subject: [PATCH 02/44] * eSync: fixed not working sending of mails after
 14.1.20141021 package

---
 mail/inc/class.mail_activesync.inc.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mail/inc/class.mail_activesync.inc.php b/mail/inc/class.mail_activesync.inc.php
index 7c1d1ae69a..cdb436abf0 100644
--- a/mail/inc/class.mail_activesync.inc.php
+++ b/mail/inc/class.mail_activesync.inc.php
@@ -474,7 +474,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 		foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($message->headers['from']):$message->headers['from'])) as $addressObject) {
 			if (!$addressObject->valid) continue;
 			if ($this->debugLevel>0) debugLog("Header Sentmail From: ".array2string($addressObject).' vs. '.array2string($message->headers['from']));
-			$mailObject->From = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : '');
+			$mailObject->From = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 			$mailObject->FromName = $addressObject->personal;
 		}
 		*/
@@ -483,21 +483,21 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 		foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($message->headers["to"]):$message->headers["to"])) as $addressObject) {
 			if (!$addressObject->valid) continue;
 			if ($this->debugLevel>0) debugLog("Header Sentmail To: ".array2string($addressObject) );
-			//$mailObject->AddAddress($addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''),$addressObject->personal);
+			//$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((get_magic_quotes_gpc()?stripslashes($message->headers["cc"]):$message->headers["cc"])) as $addressObject) {
 			if (!$addressObject->valid) continue;
 			if ($this->debugLevel>0) debugLog("Header Sentmail CC: ".array2string($addressObject) );
-			//$mailObject->AddCC($addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''),$addressObject->personal);
+			//$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((get_magic_quotes_gpc()?stripslashes($message->headers["bcc"]):$message->headers["bcc"])) as $addressObject) {
 			if (!$addressObject->valid) continue;
 			if ($this->debugLevel>0) debugLog("Header Sentmail BCC: ".array2string($addressObject) );
-			//$mailObject->AddBCC($addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''),$addressObject->personal);
+			//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$bccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		/*
@@ -505,7 +505,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 		foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($message->headers['reply-to']):$message->headers['reply-to'])) as $addressObject) {
 			if (!$addressObject->valid) continue;
 			if ($this->debugLevel>0) debugLog("Header Sentmail REPLY-TO: ".array2string($addressObject) );
-			$mailObject->AddReplyTo($addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''),$addressObject->personal);
+			$mailObject->AddReplyTo($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 		}
 		*/
 		// save some headers when forwarding mails (content type & transfer-encoding)
@@ -600,7 +600,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
 		foreach((array)$toMailAddr as $address) {
 			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : '');
+				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress,(isset($cSMRMethod)?$cSMRMethod:'REQUEST'))) continue;
 				$mailObject->AddAddress($emailAddress, $addressObject->personal);
 				$toCount++;
@@ -609,7 +609,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 		$ccCount = 0;
 		foreach((array)$ccMailAddr as $address) {
 			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : '');
+				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddCC($emailAddress, $addressObject->personal);
 				$ccCount++;
@@ -618,7 +618,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 		$bccCount = 0;
 		foreach((array)$bccMailAddr as $address) {
 			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : '');
+				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddBCC($emailAddress, $addressObject->personal);
 				$bccCount++;
@@ -920,7 +920,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 			if (count($folderArray) > 0) {
 				foreach((array)$bccMailAddr as $address) {
 					foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-						$emailAddress = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : '');
+						$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 						$mailAddr[] = array($emailAddress, $addressObject->personal);
 					}
 				}
@@ -1115,7 +1115,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['FROM']):$headers['FROM'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (FROM):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->From = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : '');
+							$mailObject->From = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 							$mailObject->FromName = $addressObject->personal;
 //error_log(__METHOD__.__LINE__.'Address to add (FROM):'.array2string($addressObject));
 						}
@@ -1123,19 +1123,19 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['TO']):$headers['TO'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (TO):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->AddAddress($addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''),$addressObject->personal);
+							$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 						}
 						// CC
 						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['CC']):$headers['CC'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (CC):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->AddCC($addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''),$addressObject->personal);
+							$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 						}
 						//	AddReplyTo
 						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['REPLY-TO']):$headers['REPLY-TO'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (ReplyTO):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->AddReplyTo($addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''),$addressObject->personal);
+							$mailObject->AddReplyTo($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 						}
 						$Header = $Body = ''; // we do not use Header and Body we use the MailObject
 						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." Creation of Mailobject succeeded.");

From b707bde89f41e986d9260e1f23b6d37e733c4530 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 29 Oct 2014 15:27:40 +0000
Subject: [PATCH 03/44] When exporting if custom project is not set, use
 current project title for Project field

---
 timesheet/inc/class.timesheet_export_csv.inc.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/timesheet/inc/class.timesheet_export_csv.inc.php b/timesheet/inc/class.timesheet_export_csv.inc.php
index d184b1e036..f6de975e9c 100644
--- a/timesheet/inc/class.timesheet_export_csv.inc.php
+++ b/timesheet/inc/class.timesheet_export_csv.inc.php
@@ -83,6 +83,12 @@ class timesheet_export_csv implements importexport_iface_export_plugin {
 		// support other selectors atm.
 		foreach ($selection as $identifier) {
 			$record = new timesheet_egw_record($identifier);
+
+			// If Project is not set, set it to current project title
+			if(!$record->ts_project && $record->pm_id)
+			{
+				$record->ts_project = egw_link::title ('projectmanager', $record->pm_id);
+			}
 			if($options['convert']) {
 				importexport_export_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $this->selects);
 			} else {

From dd6ddebb8028ca60e40309965d485cfe1d3a4c8b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 29 Oct 2014 16:03:22 +0000
Subject: [PATCH 04/44] delete user by account_id, not account_lid, as there
 might be a group with same name

---
 admin/inc/class.admin_account.inc.php            |  2 +-
 admin/inc/class.admin_cmd_delete_account.inc.php | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/inc/class.admin_account.inc.php b/admin/inc/class.admin_account.inc.php
index ec301a4b53..913e7f0e3d 100644
--- a/admin/inc/class.admin_account.inc.php
+++ b/admin/inc/class.admin_account.inc.php
@@ -217,7 +217,7 @@ class admin_account
 		}
 		if ($content['delete'])
 		{
-			$cmd = new admin_cmd_delete_account(accounts::id2name($content['account_id']), $content['new_owner'], true);
+			$cmd = new admin_cmd_delete_account($content['account_id'], $content['new_owner'], true);
 			$msg = $cmd->run();
 			if ($content['contact_id'])
 			{
diff --git a/admin/inc/class.admin_cmd_delete_account.inc.php b/admin/inc/class.admin_cmd_delete_account.inc.php
index 462ac3c84f..4bf1f7815e 100644
--- a/admin/inc/class.admin_cmd_delete_account.inc.php
+++ b/admin/inc/class.admin_cmd_delete_account.inc.php
@@ -49,16 +49,16 @@ class admin_cmd_delete_account extends admin_cmd
 		$account_id = admin_cmd::parse_account($this->account,$this->is_user);
 		admin_cmd::_instanciate_accounts();
 		$account_lid = admin_cmd::$accounts->id2name($account_id);
-		
+
 		if ($this->is_user && $this->new_user)
 		{
 			$new_user = admin_cmd::parse_account($this->new_user,true);	// true = user, no group
 		}
 		// check creator is still admin and not explicitly forbidden to edit accounts
 		if ($this->creator) $this->_check_admin($this->is_user ? 'account_access' : 'group_access',32);
-		
+
 		if ($check_only) return true;
-		
+
 		// delete the account
 		$GLOBALS['hook_values'] = array(
 			'account_id'  => $account_id,
@@ -71,14 +71,14 @@ class admin_cmd_delete_account extends admin_cmd
 		foreach(array_merge(array_diff(array_keys($GLOBALS['egw_info']['apps']),array('preferences','admin')),array('preferences','admin')) as $app)
 		{
 			$GLOBALS['egw']->hooks->single($GLOBALS['hook_values'],$app);
-		}			
+		}
 		if (!$this->is_user) $GLOBALS['egw']->accounts->delete($account_id);	// groups get not deleted via the admin hook, as users
-	
+
 		if ($account_id < 0)
 		{
-			return lang("Group '%1' deleted.",$this->account)."\n\n";
+			return lang("Group '%1' deleted.",$account_lid)."\n\n";
 		}
-		return lang("Account '%1' deleted.",$this->account)."\n\n";
+		return lang("Account '%1' deleted.",$account_lid)."\n\n";
 	}
 
 	/**

From 5098baf5385085f6ac20910c5bc8eca745e2f6d3 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 29 Oct 2014 17:01:17 +0000
Subject: [PATCH 05/44] Add item modification functionality to magicsuggest's
 selected items (Only if free entries is allowed)

---
 .../js/jquery/magicsuggest/magicsuggest.css   | 14 +++++-
 .../js/jquery/magicsuggest/magicsuggest.js    | 47 +++++++++++++++----
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/phpgwapi/js/jquery/magicsuggest/magicsuggest.css b/phpgwapi/js/jquery/magicsuggest/magicsuggest.css
index 03ecac3814..4750c6b877 100644
--- a/phpgwapi/js/jquery/magicsuggest/magicsuggest.css
+++ b/phpgwapi/js/jquery/magicsuggest/magicsuggest.css
@@ -217,7 +217,7 @@
     cursor: pointer;
     height: 7px;
     float: right;
-    margin: 6px 2px 0 10px;
+    margin: 2px 2px 0 10px;
     background-image: url(data:image/png;base64,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);
     background-position: 0 -7px;
 }
@@ -227,6 +227,18 @@
 .ms-stacked .ms-sel-item .ms-close-btn {
     margin-left: 0px;
 }
+.ms-sel-ctn .ms-sel-item .ms-edit-btn{
+    width: 7px;
+    cursor: pointer;
+    height: 7px;
+    float: right;
+    margin: 12px -18px 0 10px;
+	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAOCAYAAADjXQYbAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3godECY5jN7oQAAAAJxJREFUGNNtzyFSA1EMgOFvyzpMBVyBE2A6tJJ4nkDguAyCczAdVOpzgUVwCCSCQ2CWmWX7ojLzi+QbrKa1tscLnodVuMUjbrAdFqHhHl+4xuliDk+4wxaXOGbmNLbWdnO4wjemzPyADR7wih98Zub736kRh3l/y8xp+eCwplRVn1JVfUpV9SlVdUaJiGmsqjNKRPQpEdGnRMQ/yi9ivDd/aTuHLAAAAABJRU5ErkJggg==');
+	background-position: 0 -7px;
+}
+.ms-sel-ctn .ms-sel-item .ms-edit-btn:hover{
+    background-position: 0 0;
+}
 .ms-helper{
     color: #AAA;
     font-size: 10px;
diff --git a/phpgwapi/js/jquery/magicsuggest/magicsuggest.js b/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
index 3ff463df70..f52af79f90 100644
--- a/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
+++ b/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
@@ -635,7 +635,7 @@
         {
             cfg.dataUrlParams = $.extend({},params);
         };
-
+		
         /**********  PRIVATE ************/
         var _selection = [],      // selected objects
             _comboItemHeight = 0, // height for each combo item.
@@ -644,6 +644,7 @@
             _groups = null,
             _cbData = [],
             _ctrlDown = false,
+			_cntInMf = false, // Content is in modification mode.
             KEYCODES = {
                 BACKSPACE: 8,
                 TAB: 9,
@@ -1023,7 +1024,7 @@
 
                 $.each(_selection, function(index, value){
 
-                    var selectedItemEl, delItemEl,
+                    var selectedItemEl, delItemEl,editItemEl,
                         selectedItemHtml = cfg.selectionRenderer !== null ? cfg.selectionRenderer.call(ref, value) : value[cfg.displayField];
 
                     var validCls = self._validateSingleItem(value[cfg.displayField]) ? '' : ' ms-sel-invalid';
@@ -1048,6 +1049,13 @@
                             }).data('json', value).appendTo(selectedItemEl);
 
                             delItemEl.click($.proxy(handlers._onTagTriggerClick, ref));
+							if (cfg.allowFreeEntries === true){
+								// small pen img
+								editItemEl = $('<span/>', {
+									'class': 'ms-edit-btn'
+								}).data('json', value).appendTo(selectedItemEl);
+								editItemEl.click($.proxy(handlers._onTagEditTriggerClick, ref));
+							}
                         }
                     }
 
@@ -1215,7 +1223,7 @@
                     }
                 }
                 return true;
-            }
+			}
         };
 
         var handlers = {
@@ -1226,6 +1234,7 @@
             _onBlur: function() {
                 ms.container.removeClass('ms-ctn-focus');
                 ms.collapse();
+				_cntInMf = false;
                 _hasFocus = false;
                 if(ms.getRawValue() !== '' && cfg.allowFreeEntries === true){
                     var obj = {};
@@ -1275,8 +1284,15 @@
              * Triggered when focusing on the container div. Will focus on the input field instead.
              * @private
              */
-            _onFocus: function() {
-                ms.input.focus();
+             _onFocus: function(e) {
+				if (!_cntInMf)
+				{
+					ms.input.focus();
+				}
+				else
+				{
+					_cntInMf = false;
+				}
             },
 
             /**
@@ -1284,7 +1300,7 @@
              * @private
              */
             _onInputClick: function(){
-                if (ms.isDisabled() === false && _hasFocus) {
+                if (ms.isDisabled() === false && _hasFocus && !_cntInMf) {
                     if (cfg.toggleOnClick === true) {
                         if (cfg.expanded){
                             ms.collapse();
@@ -1300,7 +1316,7 @@
              * @private
              */
             _onInputFocus: function() {
-                if(ms.isDisabled() === false && !_hasFocus) {
+                if(ms.isDisabled() === false && !_hasFocus && !_cntInMf) {
                     _hasFocus = true;
                     ms.container.addClass('ms-ctn-focus');
                     ms.container.removeClass(cfg.invalidCls);
@@ -1478,7 +1494,22 @@
             _onTagTriggerClick: function(e) {
                 ms.removeFromSelection($(e.currentTarget).data('json'));
             },
-
+			
+			/**
+			 * Triggerd whem clicking upon edit icon (pen) for modification
+			 * @param e
+			 * @private
+			 */
+			_onTagEditTriggerClick: function(e) {
+				var itemData = $(e.currentTarget).data('json');
+				if (ms.input.val() === '')
+				{
+					ms.input.val(itemData.label);
+					ms.removeFromSelection(itemData);
+					_cntInMf = true;
+				}
+			},
+			
             /**
              * Triggered when clicking on the small trigger in the right
              * @private

From 2fe71bdc48f2a6f46b026d536fddcea13ea93d8e Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 29 Oct 2014 17:15:14 +0000
Subject: [PATCH 06/44] Cancel d-n-d action on taglist item edit button

---
 mail/js/app.js                   | 23 ++++++++++++-----------
 mail/templates/pixelegg/app.css  |  4 +++-
 mail/templates/pixelegg/app.less |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 30f593afc6..e97b83b13f 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3936,9 +3936,9 @@ app.classes.mail = AppJS.extend(
 	set_dragging_dndCompose: function ()
 	{
 		var zIndex = 100;
-		var self = this;
-
-		jQuery('div.ms-sel-item:not(div.ui-draggable)').draggable({
+		var dragItem = jQuery('div.ms-sel-item:not(div.ui-draggable)');
+		
+		dragItem.draggable({
 			appendTo:'body',
 			//Performance wise better to not add ui-draggable class to items since we are not using that class
 			containment:'document',
@@ -3946,7 +3946,7 @@ app.classes.mail = AppJS.extend(
 			cursor:'move',
 			cursorAt:{left:2},
 			//cancel dragging on close button to avoid conflict with close action
-			cancel:'.ms-close-btn',
+			cancel:'.ms-close-btn, .ms-edit-btn',
 			/**
 			 * function to act on draggable item on revert's event
 			 * @returns {Boolean} return true
@@ -3963,14 +3963,14 @@ app.classes.mail = AppJS.extend(
 			 */
 			start:function(event, ui)
 			{
-				if (event.ctrlKey)
+				var dragItem = jQuery(this);
+				if (event.ctrlKey || event.metaKey)
 				{
-					jQuery(this)
-							.addClass('mailCompose_copyEmail')
+					dragItem.addClass('mailCompose_copyEmail')
 							.css('cursor','copy');
 				}
-				jQuery(this).css ('z-index',zIndex++);
-				jQuery(this).css('position','absolute');
+				dragItem.css ('z-index',zIndex++);
+				dragItem.css('position','absolute');
 			},
 			/**
 			 *
@@ -3992,12 +3992,13 @@ app.classes.mail = AppJS.extend(
 	{
 
 		var self = this;
+		var emailTags = jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc');
 		//Call to make new items draggable
-		jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc').hover(function(){
+		emailTags.hover(function(){
 			self.set_dragging_dndCompose();
 		});
 		//Make used email-tag list widgets in mail compose droppable
-		jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc').droppable({
+		emailTags.droppable({
 			access:'.ms-sel-item',
 
 			/**
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 0226c8b39c..de85914d55 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1310,7 +1310,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
   padding-right: 5px;
 }
 #mail-compose .mailComposeHeaders span.ms-close-btn,
-#mail-compose .mailComposeHeadersSection span.ms-close-btn {
+#mail-compose .mailComposeHeadersSection span.ms-close-btn,
+#mail-compose .mailComposeHeaders span.ms-edit-btn,
+#mail-compose .mailComposeHeadersSection span.ms-edit-btn {
   width: auto;
   background-repeat: no-repeat;
   padding-right: 8px;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index e0bfb8a3d5..36dcbba42e 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -569,7 +569,7 @@ div#mail-index{
                padding-right: 5px;
         }
 
-        span.ms-close-btn {
+        span.ms-close-btn, span.ms-edit-btn{
             width: auto;
             background-repeat: no-repeat;
             padding-right: 8px;

From c917cbd8652292d2c87fc3c6f8981bb0a31dc366 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 29 Oct 2014 23:03:35 +0000
Subject: [PATCH 07/44] Link enhancements: - Add confirm dialog to delete link
 - Log unlinking files into historylog

---
 etemplate/js/et2_widget_link.js     | 23 ++++++++++++++++++-----
 phpgwapi/inc/class.egw_link.inc.php |  9 +++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/etemplate/js/et2_widget_link.js b/etemplate/js/et2_widget_link.js
index 2b1be8c0a3..c56b353539 100644
--- a/etemplate/js/et2_widget_link.js
+++ b/etemplate/js/et2_widget_link.js
@@ -1533,7 +1533,10 @@ var et2_link_list = et2_link_string.extend(
 		this.context.addItem("delete", this.egw().lang("Delete link"), this.egw().image("delete"), function(menu_item) {
 			var link_id = isNaN(self.context.data.link_id) ? self.context.data : self.context.data.link_id;
 			var row = jQuery('#link_'+(self.context.data.dom_id ? self.context.data.dom_id : self.context.data.link_id), self.list);
-			self._delete_link(link_id, row);
+			et2_dialog.show_dialog(
+				function(button) { debugger; if(button == et2_dialog.YES_BUTTON) self._delete_link(link_id,row);},
+				egw.lang('Delete link?')
+			);
 		});
 
 		// Native DnD - Doesn't play nice with jQueryUI Sortable
@@ -1660,10 +1663,20 @@ var et2_link_list = et2_link_string.extend(
 			.appendTo(delete_button)
 			// We don't use ui-icon because it assigns a bg image
 			.addClass("delete icon")
-			.bind( 'click', function() {self._delete_link(
-				self.value && typeof self.value.to_id != 'object' && _link_data.link_id ? _link_data.link_id:_link_data,
-				row
-			);});
+			.bind( 'click', function() {
+				et2_dialog.show_dialog(
+					function(button) {
+						if(button == et2_dialog.YES_BUTTON)
+						{
+							self._delete_link(
+								self.value && typeof self.value.to_id != 'object' && _link_data.link_id ? _link_data.link_id:_link_data,
+								row
+							);
+						}
+					},
+					egw.lang('Delete link?')
+				);
+			});
 
 		// Context menu
 		row.bind("contextmenu", function(e) {
diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index 228414e35b..40e871d6d1 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -1231,6 +1231,15 @@ class egw_link extends solink
 		{
 			echo '<p>'.__METHOD__."('$app','$id','$fname') url=$url</p>\n";
 		}
+		// Log in history - Need to load it first
+		if((int)$app > 0)
+		{
+			$link = self::get_link(-$app);
+			if($link['app2'] && $link['id2'])
+			{
+				historylog::static_add($link['app2'],$link['id2'],$GLOBALS['egw_info']['user']['account_id'],'~file~','', basename($url));
+			}
+		}
 		if (($Ok = !file_exists($url) || egw_vfs::remove($url,true)) && ((int)$app > 0 || $fname))
 		{
 			// try removing the dir, in case it's empty

From c891d4610494a7df64e039aa15db73e352095f41 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 08:33:46 +0000
Subject: [PATCH 08/44] * Calendar: allow admin to set a "default calendar
 view" used for first display of calendar, afterwards last selected view is
 used

---
 calendar/inc/class.calendar_hooks.inc.php | 26 +++++++++++++++++++++++
 calendar/lang/egw_de.lang                 |  1 +
 calendar/lang/egw_en.lang                 |  1 +
 3 files changed, 28 insertions(+)

diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php
index 70532aca40..0180eb7738 100644
--- a/calendar/inc/class.calendar_hooks.inc.php
+++ b/calendar/inc/class.calendar_hooks.inc.php
@@ -735,6 +735,32 @@ class calendar_hooks
 			),
 		);
 
+		if ($hook_data['type'] === 'default')
+		{
+			$settings = array_slice($settings, 0, 1, true) + array(
+				'defaultcalendar' => array(
+					'type'  => 'select',
+					'label' => 'Default calendar view',
+					'name'  => 'defaultcalendar',
+					'help'  => 'Only used for first viewing of calendar, afterwards last selected view is used.',
+					'values'	=> array(
+						'day'	=> lang('Dayview'),
+						'day4'	=> lang('four days view'),
+						'week'	=> lang('Weekview'),
+						'weekN'	=> lang('Multiple week view'),
+						'month'	=> lang('Monthview'),
+						'year'	=> lang('Yearview'),
+						'planner' => lang('Planner'),
+						'listview' => lang('listview'),
+					),
+					'xmlrpc' => True,
+					'admin'  => False,
+					'default' => 'week',
+
+				),
+			) + array_slice($settings, 1, count($settings)-1, true);
+		}
+
 		return $settings;
 	}
 
diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang
index 760535acb9..3331f79bdf 100644
--- a/calendar/lang/egw_de.lang
+++ b/calendar/lang/egw_de.lang
@@ -381,6 +381,7 @@ one week	calendar	de	eine Woche
 one year	calendar	de	ein Jahr
 only group-events	calendar	de	nur Gruppentermine
 only the initial date of that recuring event is checked!	calendar	de	Nur das Startdatum diese wiederholenden Termins wird geprüft!
+only used for first viewing of calendar, afterwards last selected view is used.	calendar	de	Wird nur bei der Erstanzeige des Kalenders benutzt, danach immer die zuletzt ausgewählte Anzeige.
 open todo's:	calendar	de	unerledigte Aufgaben:
 optional	calendar	de	Optional
 overlap holiday	calendar	de	überlappender Feiertag
diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang
index d2492dfb65..82070e586e 100644
--- a/calendar/lang/egw_en.lang
+++ b/calendar/lang/egw_en.lang
@@ -381,6 +381,7 @@ one week	calendar	en	One week
 one year	calendar	en	One year
 only group-events	calendar	en	Only group events
 only the initial date of that recuring event is checked!	calendar	en	Only the initial date of that recurring event is checked!
+only used for first viewing of calendar, afterwards last selected view is used.	calendar	en	Only used for first viewing of calendar, afterwards last selected view is used.
 open todo's:	calendar	en	Open ToDo's:
 optional	calendar	en	Optional
 overlap holiday	calendar	en	Overlap holiday

From 0429580f719d3675ce382016d47aa7eac00eb2e2 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 30 Oct 2014 09:45:49 +0000
Subject: [PATCH 09/44] Replace taglist item edit trigger from edit botton to
 doubleclick

---
 .../js/jquery/magicsuggest/magicsuggest.css     | 17 +----------------
 phpgwapi/js/jquery/magicsuggest/magicsuggest.js | 14 +++++---------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/phpgwapi/js/jquery/magicsuggest/magicsuggest.css b/phpgwapi/js/jquery/magicsuggest/magicsuggest.css
index 4750c6b877..e2070dd180 100644
--- a/phpgwapi/js/jquery/magicsuggest/magicsuggest.css
+++ b/phpgwapi/js/jquery/magicsuggest/magicsuggest.css
@@ -217,28 +217,13 @@
     cursor: pointer;
     height: 7px;
     float: right;
-    margin: 2px 2px 0 10px;
+    margin: 6px 2px 0 10px;
     background-image: url(data:image/png;base64,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);
     background-position: 0 -7px;
 }
 .ms-sel-ctn .ms-sel-item .ms-close-btn:hover{
     background-position: 0 0;
 }
-.ms-stacked .ms-sel-item .ms-close-btn {
-    margin-left: 0px;
-}
-.ms-sel-ctn .ms-sel-item .ms-edit-btn{
-    width: 7px;
-    cursor: pointer;
-    height: 7px;
-    float: right;
-    margin: 12px -18px 0 10px;
-	background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAOCAYAAADjXQYbAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3godECY5jN7oQAAAAJxJREFUGNNtzyFSA1EMgOFvyzpMBVyBE2A6tJJ4nkDguAyCczAdVOpzgUVwCCSCQ2CWmWX7ojLzi+QbrKa1tscLnodVuMUjbrAdFqHhHl+4xuliDk+4wxaXOGbmNLbWdnO4wjemzPyADR7wih98Zub736kRh3l/y8xp+eCwplRVn1JVfUpV9SlVdUaJiGmsqjNKRPQpEdGnRMQ/yi9ivDd/aTuHLAAAAABJRU5ErkJggg==');
-	background-position: 0 -7px;
-}
-.ms-sel-ctn .ms-sel-item .ms-edit-btn:hover{
-    background-position: 0 0;
-}
 .ms-helper{
     color: #AAA;
     font-size: 10px;
diff --git a/phpgwapi/js/jquery/magicsuggest/magicsuggest.js b/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
index f52af79f90..07f1dbe2be 100644
--- a/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
+++ b/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
@@ -1050,15 +1050,11 @@
 
                             delItemEl.click($.proxy(handlers._onTagTriggerClick, ref));
 							if (cfg.allowFreeEntries === true){
-								// small pen img
-								editItemEl = $('<span/>', {
-									'class': 'ms-edit-btn'
-								}).data('json', value).appendTo(selectedItemEl);
-								editItemEl.click($.proxy(handlers._onTagEditTriggerClick, ref));
+								selectedItemEl.dblclick($.proxy(handlers._onTagEditTriggerClick, ref));
 							}
                         }
                     }
-
+					
                     items.push(selectedItemEl);
                 });
                 ms.selectionContainer.prepend(items);
@@ -1332,7 +1328,7 @@
                         self._updateHelper(cfg.minCharsRenderer.call(this, cfg.minChars - curLength));
                     }
 
-                    self._renderSelection();
+                    setTimeout(function(){self._renderSelection()},300);
                     $(ms).trigger('focus', [ms]);
                 }
             },
@@ -1496,7 +1492,7 @@
             },
 			
 			/**
-			 * Triggerd whem clicking upon edit icon (pen) for modification
+			 * Triggerd when double clicking upon selected item in order to edit its content
 			 * @param e
 			 * @private
 			 */
@@ -1506,7 +1502,7 @@
 				{
 					ms.input.val(itemData.label);
 					ms.removeFromSelection(itemData);
-					_cntInMf = true;
+					_cntInMf = true; // item is in modification mode
 				}
 			},
 			

From f5c477174aa4acfae7b0b419520e3ab98dc80ed1 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 30 Oct 2014 09:54:29 +0000
Subject: [PATCH 10/44] Get compose email d-n-d working peacfully with taglist
 doubleclick item modification

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

diff --git a/mail/js/app.js b/mail/js/app.js
index e97b83b13f..a637ce2474 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3946,7 +3946,7 @@ app.classes.mail = AppJS.extend(
 			cursor:'move',
 			cursorAt:{left:2},
 			//cancel dragging on close button to avoid conflict with close action
-			cancel:'.ms-close-btn, .ms-edit-btn',
+			cancel:'.ms-close-btn',
 			/**
 			 * function to act on draggable item on revert's event
 			 * @returns {Boolean} return true
@@ -3981,7 +3981,8 @@ app.classes.mail = AppJS.extend(
 			{
 				jQuery(this).css('css','move');
 			}
-		});
+		}).draggable('disable');
+		setTimeout(function(){dragItem.draggable('enable');},400)
 	},
 
 	/**

From a4389c7cbcc31b41b7afb0920145af812ec27fae Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 10:24:11 +0000
Subject: [PATCH 11/44] fix javascript error when creating an exception

---
 calendar/js/app.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index b947a85af1..5a9f81e32e 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -85,7 +85,7 @@ app.classes.calendar = AppJS.extend(
 		this._init_sidebox(sidebox);
 
 		var content = this.et2.getArrayMgr('content');
-		
+
 		switch (_name)
 		{
 			case 'calendar.list':
@@ -101,7 +101,8 @@ app.classes.calendar = AppJS.extend(
 					{
 						this.set_enddate_visibility();
 						this.check_recur_type();
-						this.et2.getWidgetById('recur_exception').set_disabled(typeof content.data['recur_exception'][0] == 'undefined');
+						this.et2.getWidgetById('recur_exception').set_disabled(!content.data.recur_exception ||
+							typeof content.data.recur_exception[0] == 'undefined');
 					}
 					else
 					{
@@ -175,15 +176,15 @@ app.classes.calendar = AppJS.extend(
 					{
 						var iframe = parent.jQuery(parent.document).find('.egw_fw_content_browser_iframe');
 						var calTab = iframe.parentsUntil(jQuery('.egw_fw_ui_tab_content'),'.egw_fw_ui_tab_content');
-						
-						if (!calTab.is(':visible')) 
+
+						if (!calTab.is(':visible'))
 						{
-							// F.F can not handle to style correctly an iframe which is hidden (display:none), therefore we need to 
+							// F.F can not handle to style correctly an iframe which is hidden (display:none), therefore we need to
 							// bind a handler to refresh the calendar views after it shows up
 							iframe.one('show',function(){egw_refresh('','calendar');})
 						}
 						else
-						{	
+						{
 							//window.location.reload();
 							window.egw_refresh('refreshing calendar','calendar');
 						}
@@ -451,7 +452,7 @@ app.classes.calendar = AppJS.extend(
 							{
 								// bind on tooltip close event
 								$ttp.on("tooltipclose", function (event, ui){
-									// bind hover handler on tooltip helper in order to be able to freeze the tooltip and scrolling 
+									// bind hover handler on tooltip helper in order to be able to freeze the tooltip and scrolling
 									ui.tooltip.hover(
 										function () {
 											var $ttp_helper = jQuery(this);

From f55380b8d7aca851ca03f82b29a4e410622d7bd0 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 30 Oct 2014 10:51:40 +0000
Subject: [PATCH 12/44] Mark all content of the item after double clicking to
 modify

---
 phpgwapi/js/jquery/magicsuggest/magicsuggest.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpgwapi/js/jquery/magicsuggest/magicsuggest.js b/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
index 07f1dbe2be..e8e97eec09 100644
--- a/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
+++ b/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
@@ -1502,6 +1502,7 @@
 				{
 					ms.input.val(itemData.label);
 					ms.removeFromSelection(itemData);
+					ms.input.select();
 					_cntInMf = true; // item is in modification mode
 				}
 			},

From 6c7c29316ab8053d30dc89a59286b1e8f9dbbe70 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 11:09:38 +0000
Subject: [PATCH 13/44] making popup resize a bit more relyable by using an
 extra timeout and trigger it for every load, not just first one

---
 phpgwapi/js/jsapi/egw.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js
index 543e3ae844..d0576aa572 100644
--- a/phpgwapi/js/jsapi/egw.js
+++ b/phpgwapi/js/jsapi/egw.js
@@ -223,22 +223,23 @@
 				if(popup || window.opener)
 				{
 					// Resize popup when et2 load is done
-					jQuery(node).one("load",function() {
-						var $main_div = $j('#popupMainDiv');
-						var $et2 = $j('.et2_container');
-						var w = {
-							width: egw_getWindowInnerWidth(),
-							height: egw_getWindowInnerHeight()
-						};
-						// Use et2_container for width since #popupMainDiv is full width, but we still need
-						// 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()));
-						debugger;
-						if(delta_width != 0 || delta_height != 0)
-						{
-							window.resizeTo(egw_getWindowOuterWidth() - delta_width,egw_getWindowOuterHeight() - delta_height);
-						}
+					jQuery(node).on("load",function() {
+						window.setTimeout(function() {
+							var $main_div = $j('#popupMainDiv');
+							var $et2 = $j('.et2_container');
+							var w = {
+								width: egw_getWindowInnerWidth(),
+								height: egw_getWindowInnerHeight()
+							};
+							// Use et2_container for width since #popupMainDiv is full width, but we still need
+							// 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()));
+							if(delta_width != 0 || delta_height != 0)
+							{
+								window.resizeTo(egw_getWindowOuterWidth() - delta_width,egw_getWindowOuterHeight() - delta_height);
+							}
+						}, 200);
 					});
 				}
 				var et2 = new etemplate2(node, currentapp+".etemplate_new.ajax_process_content.etemplate");

From 0f362fa6a0c8b971ee5ad7659d5a94d132031375 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 11:11:12 +0000
Subject: [PATCH 14/44] fix popup was never wide enought problem by removing
 width:100% from #popupMainDiv

---
 mail/templates/pixelegg/app.css  | 8 ++------
 mail/templates/pixelegg/app.less | 5 -----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index de85914d55..cec3ee6956 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -525,7 +525,8 @@ div.mail-compose_fileselector {
   border: 0px !important;
   display: none !important;
 }
-#mail-display {
+#mail-display,
+#mail-compose {
   min-height: 500px;
 }
 .mailDisplayContainer,
@@ -1473,11 +1474,6 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
  *          Preview
  * ##################################################################################
  */
-div#popupMainDiv {
-  padding: 8px;
-  margin: -6px 0px 6px -1px;
-  width: 100%;
-}
 #mail-display {
   width: 870px;
   min-height: 500px;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 36dcbba42e..3507775d14 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -663,11 +663,6 @@ div#mail-index{
  *          Preview
  * ##################################################################################
  */
-div#popupMainDiv{
-        padding: 8px;
-        margin: -6px 0px 6px -1px;
-        width: 100%;
-}
 
 #mail-display{
     //	gesamtbreite

From 0d1a1c3f4a5425cf11e698fb0acf4a18f6715914 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 30 Oct 2014 11:55:22 +0000
Subject: [PATCH 15/44] Adjust speed of double click trigger for taglist item
 modification

---
 mail/js/app.js                                | 94 ++++++++++---------
 .../js/jquery/magicsuggest/magicsuggest.js    | 10 +-
 2 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index a637ce2474..4def2c5a05 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3937,52 +3937,58 @@ app.classes.mail = AppJS.extend(
 	{
 		var zIndex = 100;
 		var dragItem = jQuery('div.ms-sel-item:not(div.ui-draggable)');
-		
-		dragItem.draggable({
-			appendTo:'body',
-			//Performance wise better to not add ui-draggable class to items since we are not using that class
-			containment:'document',
-			distance: 0,
-			cursor:'move',
-			cursorAt:{left:2},
-			//cancel dragging on close button to avoid conflict with close action
-			cancel:'.ms-close-btn',
-			/**
-			 * function to act on draggable item on revert's event
-			 * @returns {Boolean} return true
-			 */
-			revert: function (){
-				this.parent().find('.ms-sel-item').css('position','relative');
-				return true;
-			},
-			/**
-			 * function to act as draggable starts dragging
-			 *
-			 * @param {type} event
-			 * @param {type} ui
-			 */
-			start:function(event, ui)
-			{
-				var dragItem = jQuery(this);
-				if (event.ctrlKey || event.metaKey)
+		if (dragItem.length > 0)
+		{
+			dragItem.draggable({
+				appendTo:'body',
+				//Performance wise better to not add ui-draggable class to items since we are not using that class
+				containment:'document',
+				distance: 0,
+				cursor:'move',
+				cursorAt:{left:2},
+				//cancel dragging on close button to avoid conflict with close action
+				cancel:'.ms-close-btn',
+				/**
+				 * function to act on draggable item on revert's event
+				 * @returns {Boolean} return true
+				 */
+				revert: function (){
+					this.parent().find('.ms-sel-item').css('position','relative');
+					return true;
+				},
+				/**
+				 * function to act as draggable starts dragging
+				 *
+				 * @param {type} event
+				 * @param {type} ui
+				 */
+				start:function(event, ui)
 				{
-					dragItem.addClass('mailCompose_copyEmail')
-							.css('cursor','copy');
+					var dragItem = jQuery(this);
+					if (event.ctrlKey || event.metaKey)
+					{
+						dragItem.addClass('mailCompose_copyEmail')
+								.css('cursor','copy');
+					}
+					dragItem.css ('z-index',zIndex++);
+					dragItem.css('position','absolute');
+				},
+				/**
+				 *
+				 * @param {type} event
+				 * @param {type} ui
+				 */
+				create:function(event,ui)
+				{
+					jQuery(this).css('css','move');
 				}
-				dragItem.css ('z-index',zIndex++);
-				dragItem.css('position','absolute');
-			},
-			/**
-			 *
-			 * @param {type} event
-			 * @param {type} ui
-			 */
-			create:function(event,ui)
-			{
-				jQuery(this).css('css','move');
-			}
-		}).draggable('disable');
-		setTimeout(function(){dragItem.draggable('enable');},400)
+			}).draggable('disable');
+			window.setTimeout(function(){
+			
+				if(dragItem && dragItem.data() && typeof dragItem.data()['uiDraggable'] !== 'undefined') dragItem.draggable('enable');
+			},100);
+		}
+		
 	},
 
 	/**
diff --git a/phpgwapi/js/jquery/magicsuggest/magicsuggest.js b/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
index e8e97eec09..53e9860c02 100644
--- a/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
+++ b/phpgwapi/js/jquery/magicsuggest/magicsuggest.js
@@ -1024,7 +1024,7 @@
 
                 $.each(_selection, function(index, value){
 
-                    var selectedItemEl, delItemEl,editItemEl,
+                    var selectedItemEl, delItemEl,
                         selectedItemHtml = cfg.selectionRenderer !== null ? cfg.selectionRenderer.call(ref, value) : value[cfg.displayField];
 
                     var validCls = self._validateSingleItem(value[cfg.displayField]) ? '' : ' ms-sel-invalid';
@@ -1050,7 +1050,7 @@
 
                             delItemEl.click($.proxy(handlers._onTagTriggerClick, ref));
 							if (cfg.allowFreeEntries === true){
-								selectedItemEl.dblclick($.proxy(handlers._onTagEditTriggerClick, ref));
+								selectedItemEl.dblclick($.proxy(handlers._onTagEditTriggerDblClick, ref));
 							}
                         }
                     }
@@ -1280,7 +1280,7 @@
              * Triggered when focusing on the container div. Will focus on the input field instead.
              * @private
              */
-             _onFocus: function(e) {
+             _onFocus: function() {
 				if (!_cntInMf)
 				{
 					ms.input.focus();
@@ -1328,7 +1328,7 @@
                         self._updateHelper(cfg.minCharsRenderer.call(this, cfg.minChars - curLength));
                     }
 
-                    setTimeout(function(){self._renderSelection()},300);
+                    setTimeout(function(){self._renderSelection()},400);
                     $(ms).trigger('focus', [ms]);
                 }
             },
@@ -1496,7 +1496,7 @@
 			 * @param e
 			 * @private
 			 */
-			_onTagEditTriggerClick: function(e) {
+			_onTagEditTriggerDblClick: function(e) {
 				var itemData = $(e.currentTarget).data('json');
 				if (ms.input.val() === '')
 				{

From a9c6c2a90e52197ce1d0492a091c838f3c7de9a4 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 30 Oct 2014 12:26:42 +0000
Subject: [PATCH 16/44] Display account_fullname of event owner, creator, and
 participant in calendar customized link title

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

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 057167318e..a4749343fa 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -1885,13 +1885,13 @@ class calendar_bo
 					case 'participants':
 						foreach ($event[$val] as $key => $value)
 						{
-							$extra_fields [$val] = accounts::id2name($key);
+							$extra_fields [$val] = accounts::id2name($key, 'account_fullname');
 						}	
 						break;
 					case 'modifier':
 					case 'creator':
 					case 'owner':
-						$extra_fields [$val] = accounts::id2name($event[$val]);
+						$extra_fields [$val] = accounts::id2name($event[$val], 'account_fullname');
 						break;
 					default:
 						$extra_fields [] = $event[$val];

From 1c6524cf0be488621891cb33afcc5be3701f2cb1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 13:20:04 +0000
Subject: [PATCH 17/44] remove upper limit of number of characters at last
 domain-part to allow new domain-names like .hamburg

---
 etemplate/inc/class.etemplate_widget_url.inc.php | 2 +-
 etemplate/inc/class.url_widget.inc.php           | 2 +-
 etemplate/js/et2_widget_url.js                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_url.inc.php b/etemplate/inc/class.etemplate_widget_url.inc.php
index 639d4ead8f..7b84558a63 100644
--- a/etemplate/inc/class.etemplate_widget_url.inc.php
+++ b/etemplate/inc/class.etemplate_widget_url.inc.php
@@ -33,7 +33,7 @@ class etemplate_widget_url extends etemplate_widget
 	 *
 	 * Same preg is in et2_widget_url Javascript class, but no \x00 allowed and /u modifier for utf8!
 	 */
-	const EMAIL_PREG = "/^(([^\042',<][^,<]+|\042[^\042]+\042|\'[^\']+\'|)\s?<)?[^\x01-\x20()<>@,;:\042\[\]]+@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,6}>?$/iu";
+	const EMAIL_PREG = "/^(([^\042',<][^,<]+|\042[^\042]+\042|\'[^\']+\'|)\s?<)?[^\x01-\x20()<>@,;:\042\[\]]+@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,}>?$/iu";
 
 	/**
 	 * Validate input
diff --git a/etemplate/inc/class.url_widget.inc.php b/etemplate/inc/class.url_widget.inc.php
index 7407a95ec4..6ee5a10a72 100644
--- a/etemplate/inc/class.url_widget.inc.php
+++ b/etemplate/inc/class.url_widget.inc.php
@@ -63,7 +63,7 @@ class url_widget
 	 */
 	//const EMAIL_PREG = '([a-z0-9][a-z0-9._-]*)?[a-z0-9]@([a-z0-9](|[a-z0-9_-]*[a-z0-9])\.)+[a-z]{2,6}';
 	//const EMAIL_PREG = '([a-z0-9][a-z0-9._\'\&\+-]*)?[a-z0-9_]@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,6}';
-	const EMAIL_PREG = '^[^\x00-\x20()<>@,;:\\"\[\]]+@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,6}';
+	const EMAIL_PREG = '^[^\x00-\x20()<>@,;:\\"\[\]]+@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,}';
 
 	/**
 	 * pre-processing of the extension
diff --git a/etemplate/js/et2_widget_url.js b/etemplate/js/et2_widget_url.js
index 23915b99e2..eb0f1d6576 100644
--- a/etemplate/js/et2_widget_url.js
+++ b/etemplate/js/et2_widget_url.js
@@ -48,7 +48,7 @@ var et2_url = et2_textbox.extend(
 	 *
 	 * Same preg is in etemplate_widget_url PHP class!
 	 */
-	EMAIL_PREG: new RegExp(/^(([^\042',<][^,<]+|\042[^\042]+\042|\'[^\']+\'|)\s?<)?[^\x00-\x20()<>@,;:\042\[\]]+@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,6}>?$/i),
+	EMAIL_PREG: new RegExp(/^(([^\042',<][^,<]+|\042[^\042]+\042|\'[^\']+\'|)\s?<)?[^\x00-\x20()<>@,;:\042\[\]]+@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,}>?$/i),
 	/**
 	 * @memberOf et2_url
 	 */

From 836251277c495c28c1e3280ae069a58f0bf1a42d Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 30 Oct 2014 14:13:45 +0000
Subject: [PATCH 18/44] Style customfields' edit popup dialog

---
 admin/templates/default/customfield_edit.xet | 56 +++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/admin/templates/default/customfield_edit.xet b/admin/templates/default/customfield_edit.xet
index b21c7d72c8..248910b289 100644
--- a/admin/templates/default/customfield_edit.xet
+++ b/admin/templates/default/customfield_edit.xet
@@ -4,11 +4,17 @@
 	<template id="admin.customfield_edit" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
+				<column width="130"/>
+				<column width="350"/>
 				<column/>
-				<column/>
-				<column/>
+				<column width="30"/>
 			</columns>
 			<rows>
+				<row class="dialogHeader" height="28">
+					<description statustext="the name used internaly (&amp;lt;= 20 chars), changeing it makes existing data unavailible" value="Name"/>
+					<textbox statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" id="cf_name" size="20" maxlength="32" needed="true" class="et2_fullWidth" span="2"/>
+					<appicon/>
+				</row>
 				<row disabled="@no_types">
 					<description value="Type"/>
 					<menulist>
@@ -16,34 +22,23 @@
 					</menulist>
 					<description/>
 				</row>
-				<row>
-					<description statustext="the name used internaly (&amp;lt;= 20 chars), changeing it makes existing data unavailible" value="Name"/>
-					<textbox statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" id="cf_name" size="20" maxlength="32" needed="true"/>
-					<description/>
-				</row>
 				<row>
 					<description value="Label"/>
-					<vbox>
-						<textbox statustext="the text displayed to the user" id="cf_label" maxlength="255"/>
-						<description id="cf_label"/>
-					</vbox>
+					<textbox statustext="the text displayed to the user" id="cf_label" maxlength="255" class="et2_fullWidth"/>
 					<description/>
 				</row>
 				<row>
 					<description value="Type of field"/>
-					<vbox>
-						<customfields-types statustext="Type of customfield" id="cf_type"/>
-					</vbox>
-					<description/>
-				</row>
-				<row>
-					<description value="Required"/>
-					<checkbox id="cf_needed"/>
+					<customfields-types statustext="Type of customfield" id="cf_type" class="et2_fullWidth"/>
+					<hbox>
+						<description value="Required"/>
+						<checkbox id="cf_needed"/>
+					</hbox>
 					<description/>
 				</row>
 				<row disabled="!@use_private">
 					<description value="Private"/>
-					<taglist-account statustext="Select accounts for which the custom field should be visible" id="cf_private" rows="3" account_type="both" span="2"/>
+					<taglist-account class="et2_fullWidth" statustext="Select accounts for which the custom field should be visible" id="cf_private" rows="3" account_type="both" span="2"/>
 					<description/>
 				</row>
 				<row>
@@ -51,18 +46,15 @@
 					<textbox multiline="true" statustext="each value is a line like id[=label]" id="cf_values" rows="4" cols="30" span="2" width="99%"/>
 				</row>
 				<row>
-					<description value="Length"/>
-					<textbox statustext="max length of the input [, length of the inputfield (optional)]" id="cf_len" size="5"/>
-					<description/>
-				</row>
-				<row>
-					<description value="Rows"/>
-					<textbox type="integer" blur="1" statustext="number of row for a multiline inputfield or line of a multi-select-box" id="cf_rows" min="0" max="10" size="2"/>
-					<description/>
-				</row>
-				<row>
-					<description value="Order"/>
-					<textbox type="integer" statustext="determines the order the fields are displayed" id="cf_order" min="1" size="3"/>
+					<description value="Attributes"/>
+					<box span="2">
+						<description value="Length:"/>
+						<textbox statustext="max length of the input [, length of the inputfield (optional)]" id="cf_len" size="5"/>
+						<description value="Rows:"/>
+						<textbox type="integer" blur="1" statustext="number of row for a multiline inputfield or line of a multi-select-box" id="cf_rows" min="0" max="10" size="2"/>
+						<description value="Order:"/>
+						<textbox type="integer" statustext="determines the order the fields are displayed" id="cf_order" min="1" size="3"/>			
+					</box>
 					<description/>
 				</row>
 				<row class="dialogFooterToolbar">

From 8d52ecd059d6abc841dca92cda353c5459978fb7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 15:12:37 +0000
Subject: [PATCH 19/44] not show apps and context-menu entries for apps not
 available to user, hooks->single() did not check apps for new method-hooks

---
 admin/inc/class.admin_passwordreset.inc.php | 6 +++---
 admin/inc/class.admin_ui.inc.php            | 4 ++--
 phpgwapi/inc/class.hooks.inc.php            | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/admin/inc/class.admin_passwordreset.inc.php b/admin/inc/class.admin_passwordreset.inc.php
index 2de696ed7c..27f82adaa9 100644
--- a/admin/inc/class.admin_passwordreset.inc.php
+++ b/admin/inc/class.admin_passwordreset.inc.php
@@ -73,10 +73,10 @@ class admin_passwordreset
 			if ($content['download_csv'] && $content['changed'])
 			{
 				html::content_header('changed.csv','text/csv');
-				//echo "account_lid;account_password;account_email;account_firstname;account_lastname\n";
+				//echo "account_lid;account_passwd;account_email;account_firstname;account_lastname\n";
 				foreach($content['changed'] as $account)
 				{
-					echo "$account[account_lid];$account[account_password];$account[account_email];$account[account_firstname];$account[account_lastname]\n";
+					echo "$account[account_lid];$account[account_passwd];$account[account_email];$account[account_firstname];$account[account_lastname]\n";
 				}
 				common::egw_exit();
 			}
@@ -149,7 +149,7 @@ class admin_passwordreset
 								$GLOBALS['egw']->acl->delete_repository('preferences','nopasswordchange',$account_id);
 							}
 						}
-						$account['account_password'] = $password;
+						$account['account_passwd'] = $password;
 
 						if ((string)$content['mail']['activate'] !== '' || (string)$content['mail']['quota'] !== '' ||
 							strpos($content['mail']['domain'], '.') !== false)
diff --git a/admin/inc/class.admin_ui.inc.php b/admin/inc/class.admin_ui.inc.php
index 194fd75684..52a1cbc0ec 100644
--- a/admin/inc/class.admin_ui.inc.php
+++ b/admin/inc/class.admin_ui.inc.php
@@ -145,7 +145,7 @@ class admin_ui
 		foreach($apps as $app)
 		{
 			$GLOBALS['menuData'] = $data = array();
-			$data = $GLOBALS['egw']->hooks->single('edit_group', $app, true);
+			$data = $GLOBALS['egw']->hooks->single('edit_group', $app);
 			if (!is_array($data)) $data = $GLOBALS['menuData'];
 			//error_log(__METHOD__."() app $app returned ".array2string($data));
 			foreach($data as $item)
@@ -226,7 +226,7 @@ class admin_ui
 			foreach($apps as $app)
 			{
 				$GLOBALS['menuData'] = $data = array();
-				$data = $GLOBALS['egw']->hooks->single('edit_user', $app, true);
+				$data = $GLOBALS['egw']->hooks->single('edit_user', $app);
 				if (!is_array($data)) $data = $GLOBALS['menuData'];
 				foreach($data as $item)
 				{
diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index 2f5a640b26..2511fbb203 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -138,6 +138,11 @@ class hooks
 		{
 			$appname = is_array($args) && isset($args['appname']) ? $args['appname'] : $GLOBALS['egw_info']['flags']['currentapp'];
 		}
+		// excute hook only if $no_permission_check or user has run-rights for app
+		if (!($no_permission_check || isset($GLOBALS['egw_info']['user']['apps'][$appname])))
+		{
+			return false;
+		}
 		$SEP = filesystem_separator();
 
 		/* First include the ordered apps hook file */

From a1a88d801ad9817d23e74c3bf35c77d794d9825e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 15:18:59 +0000
Subject: [PATCH 20/44] show sha1 hashes for uploaded backups

---
 setup/db_backup.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setup/db_backup.php b/setup/db_backup.php
index 7f06a625a6..8a184509d5 100644
--- a/setup/db_backup.php
+++ b/setup/db_backup.php
@@ -153,10 +153,9 @@ if ($_POST['upload'] && is_array($_FILES['uploaded']) && !$_FILES['uploaded']['e
 {
 	move_uploaded_file($_FILES['uploaded']['tmp_name'],$db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
 
-	if (function_exists('md5_file'))	// php4.2+
-	{
-		$md5 = ', md5='.md5_file($db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
-	}
+	$md5 = ', md5='.md5_file($db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
+	$md5 .= ', sha1='.sha1_file($db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
+
 	$setup_tpl->set_var('error_msg',lang("succesfully uploaded file %1",$_FILES['uploaded']['name'].', '.
 		sprintf('%3.1lf MB (%d)',$_FILES['uploaded']['size']/(1024*1024),$_FILES['uploaded']['size']).$md5));
 }

From ae282257dc85c4e287ac1933ae25347a32beb2ff Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 15:21:39 +0000
Subject: [PATCH 21/44] support for Univention LDAP schemas

---
 phpgwapi/inc/class.accounts_ldap.inc.php | 151 +++++++++++++++--------
 1 file changed, 100 insertions(+), 51 deletions(-)

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index 9163532bfa..e51b1134c5 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -53,7 +53,7 @@ class accounts_ldap
 	 */
 	var $user_context;
 	/**
-	 * LDAP search filter for user accounts, eg. (uid=%name)
+	 * LDAP search filter for user accounts, eg. (uid=%user)
 	 *
 	 * @var string
 	 */
@@ -82,16 +82,26 @@ class accounts_ldap
 		'user' => array(
 			'top','person','organizationalperson','inetorgperson','posixaccount','shadowaccount'
 		),
-		'user-if-supported' => array(	// these classes get added, only if the server supports them
-			'mozillaabpersonalpha','mozillaorgperson','evolutionperson'
+		'user-if-supported' => array(	// these classes get added, if server supports them
+			'mozillaabpersonalpha','mozillaorgperson','evolutionperson','univentionperson'
 		),
 		'group' => array(
 			'top','posixgroup','groupofnames'
+		),
+		'group-if-supported' => array(	// these classes get added, if servers supports them
+			'univentiongroup',
 		)
 	);
 	/**
 	 * Classes allowing to set a mail-address for a group and specify the memberaddresses as forwarding addresses
 	 *
+	 * $objectclass => $forward
+	 * $objectclass => [$forward, $extra_attr, $mail_attr, $keep_objectclass]
+	 * $forward          : name of attribute to set forwards for members mail addresses, false if not used/required
+	 * $extra_attr       : required attribute (eg. 'uid'), which need to be set, default none
+	 * $mail_attr        : name of attribute for mail-address, if not 'mail'
+	 * $keep_objectclass : true to not remove objectclass, if not mail set
+	 *
 	 * @var array
 	 */
 	var $group_mail_classes = array(
@@ -99,6 +109,7 @@ class accounts_ldap
 		'dbmailuser' => array('mailforwardingaddress','uid'),
 		'qmailuser' => array('mailforwardingaddress','uid'),
 		'mailaccount' => 'mailalias',
+		'univentiongroup' => array(false, false, 'mailprimaryaddress', true),
 	);
 
 	/**
@@ -200,10 +211,7 @@ class accounts_ldap
 			else
 			{
 				$old = ldap::result2array($old[0]);
-				foreach($old['objectclass'] as $n => $class)
-				{
-					$old['objectclass'][$n] = strtolower($class);
-				}
+				$old['objectclass'] = array_map('strtolower', $old['objectclass']);
 				$key = false;
 				if ($is_group && ($key = array_search('namedobject',$old['objectclass'])) !== false ||
 					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'],0,3) != 'cn=') ||
@@ -243,9 +251,9 @@ class accounts_ldap
 			{
 				$to_write['objectclass'] = $old ? $old['objectclass'] : array();
 			}
-			if (!$old && !$is_group)	// for new accounts add additional addressbook object classes, if supported by server
+			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
-				foreach($this->requiredObjectClasses['user-if-supported'] as $additional)
+				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
 				{
 					if ($this->ldapServerInfo->supportsObjectClass($additional))
 					{
@@ -269,20 +277,22 @@ class accounts_ldap
 			$to_write = $this->_merge_group($to_write,$data_utf8);
 			$data['account_type'] = 'g';
 
-			$groupOfNames = in_array('groupofnames',$old ? $old['objectclass'] : $to_write['objectclass']);
-			if (!$old && $groupOfNames || $members)
+			$objectclass = $old ? $old['objectclass'] : $to_write['objectclass'];
+			if ($members || !$old && array_intersect(array('groupofnames','groupofuniquenames','univentiongroup'), $objectclass))
 			{
-				$to_write = array_merge($to_write,$this->set_members($members,
-					$data['account_id'],$groupOfNames,$dn));
+				$to_write = array_merge($to_write, $this->set_members($members, $data['account_id'], $objectclass, $dn));
 			}
 			// check if we should set a mail address and forwards for each member
 			foreach($this->group_mail_classes as $objectclass => $forward)
 			{
+				$extra_attr = false;
+				$mail_attr = 'mail';
+				$keep_objectclass = false;
+				if (is_array($forward)) list($forward,$extra_attr,$mail_attr,$keep_objectclass) = $forward;
+
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
-					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old['mail']))
+					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[$mail_attr]))
 				{
-					$extra_attr = false;
-					if (is_array($forward)) list($forward,$extra_attr) = $forward;
 					if ($data_utf8['account_email'])	// setting an email
 					{
 						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
@@ -291,23 +301,27 @@ class accounts_ldap
 							$to_write['objectclass'][] = $objectclass;
 						}
 						if ($extra_attr) $to_write[$extra_attr] = $data_utf8['account_lid'];
-						$to_write['mail'] = $data_utf8['account_email'];
+						$to_write[$mail_attr] = $data_utf8['account_email'];
 
-						if (!$members) $members = $this->members($data['account_id']);
-						$to_write[$forward] = array();
-						foreach (array_keys($members) as $member)
+						if ($forward)
 						{
-							if (($email = $this->id2name($member,'account_email')))
+							if (!$members) $members = $this->members($data['account_id']);
+							$to_write[$forward] = array();
+							foreach (array_keys($members) as $member)
 							{
-								$to_write[$forward][] = $email;
+								if (($email = $this->id2name($member,'account_email')))
+								{
+									$to_write[$forward][] = $email;
+								}
 							}
 						}
 					}
 					elseif($old)	// remove the mail and forwards only for existing entries
 					{
-						$to_write['mail'] = $to_write[$forward] = array();
+						$to_write[$mail_attr] = array();
+						if ($forward) $to_write[$forward] = array();
 						if ($extra_attr) $to_write[$extra_attr] = array();
-						if (($key = array_search($objectclass,$old['objectclass'])))
+						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
 							unset($to_write['objectclass'][$key]);
@@ -360,8 +374,6 @@ class accounts_ldap
 			if ($err)
 			{
 				error_log(__METHOD__."() ldap_".($old ? 'modify' : 'add')."(,'$dn',".array2string($to_write).") --> ldap_error()=".ldap_error($this->ds));
-				echo "ldap_".($old ? 'modify' : 'add')."(,$dn,".print_r($to_write,true).")\n";
-				echo ldap_error($this->ds);
 				return false;
 			}
 		}
@@ -410,8 +422,23 @@ class accounts_ldap
 	 */
 	protected function _read_group($account_id)
 	{
+		$mail_attr = 'mail';
+		$group = array();
+		if (!is_object($this->ldapServerInfo))
+		{
+			$this->ldapServerInfo = $this->ldap->getLDAPServerInfo($this->frontend->config['ldap_host']);
+		}
+		foreach($this->group_mail_classes as $objectclass => $attrs)
+		{
+			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
+			{
+				$group['mailAllowed'] = $objectclass;
+				if (is_array($attrs) && $attrs[2]) $mail_attr = $attrs[2];
+				break;
+			}
+		}
 		$sri = ldap_search($this->ds, $this->group_context,'(&(objectClass=posixGroup)(gidnumber=' . abs($account_id).'))',
-			array('dn','gidnumber','cn','objectclass','mail'));
+			array('dn', 'gidnumber', 'cn', 'objectclass', $mail_attr, 'memberuid'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
@@ -419,8 +446,9 @@ class accounts_ldap
 			return false;	// group not found
 		}
 		$data = translation::convert($ldap_data[0],'utf-8');
+		unset($data['objectclass']['count']);
 
-		$group = array(
+		$group += array(
 			'account_dn'        => $data['dn'],
 			'account_id'        => -$data['gidnumber'][0],
 			'account_lid'       => $data['cn'][0],
@@ -428,21 +456,24 @@ class accounts_ldap
 			'account_firstname' => $data['cn'][0],
 			'account_lastname'  => lang('Group'),
 			'account_fullname'  => lang('Group').' '.$data['cn'][0],
-			'groupOfNames'      => in_array('groupOfNames',$data['objectclass']),
-			'account_email'     => $data['mail'][0],
+			'objectclass'       => array_map('strtolower', $data['objectclass']),
+			'account_email'     => $data[$mail_attr][0],
+			'members'           => array(),
 		);
-		if (!is_object($this->ldapServerInfo))
+
+		if (isset($data['memberuid']))
 		{
-			$this->ldapServerInfo = $this->ldap->getLDAPServerInfo($this->frontend->config['ldap_host']);
-		}
-		foreach(array_keys($this->group_mail_classes) as $objectclass)
-		{
-			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
+			unset($data['memberuid']['count']);
+
+			foreach($data['memberuid'] as $lid)
 			{
-				$group['mailAllowed'] = $objectclass;
-				break;
+				if (($id = $this->name2id($lid, 'account_lid', 'u')))
+				{
+					$group['members'][$id] = $lid;
+				}
 			}
 		}
+
 		return $group;
 	}
 
@@ -745,7 +776,7 @@ class accounts_ldap
 							'account_modified' => isset($allVals['modifytimestamp'][0]) ? self::accounts_ldap2ts($allVals['modifytimestamp'][0]) : null,
 							'account_primary_group' => (string)-$allVals['gidnumber'][0],
 						);
-						error_log(__METHOD__."() ldap=".array2string($allVals)." --> account=".array2string($account));
+						//error_log(__METHOD__."() ldap=".array2string($allVals)." --> account=".array2string($account));
 						if ($param['active'] && !$this->frontend->is_active($account))
 						{
 							if (isset($totalcount)) --$totalcount;
@@ -755,7 +786,7 @@ class accounts_ldap
 						// return objectclass(es)
 						if ($param['objectclass'])
 						{
-							$account['objectclass'] = $allVals['objectclass'];
+							$account['objectclass'] = array_map('strtolower', $allVals['objectclass']);
 							unset($account['objectclass']['count']);
 						}
 						$accounts[$account['account_id']] = $account;
@@ -1005,9 +1036,11 @@ class accounts_ldap
 		$members = array();
 		if (isset($group[0]['memberuid']))
 		{
+			unset($group[0]['memberuid']['count']);
+
 			foreach($group[0]['memberuid'] as $lid)
 			{
-				if (($id = $this->name2id($lid)))
+				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
 					$members[$id] = $lid;
 				}
@@ -1054,34 +1087,47 @@ class accounts_ldap
 	 *
 	 * @param array $members array with uidnumber or uid's
 	 * @param int $gid gidnumber of group to set
-	 * @param boolean $groupOfNames =null should we set the member attribute of groupOfNames (default detect it)
+	 * @param array $objectclass =null should we set the member and uniqueMember attributes (groupOf(Unique)Names|univentionGroup) (default detect it)
 	 * @param string $use_cn =null if set $cn is used instead $gid and the attributes are returned, not written to ldap
+	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
-	function set_members($members,$gid,$groupOfNames=null,$use_cn=null)
+	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
 	{
 		//echo "<p>accounts_ldap::set_members(".print_r($members,true).",$gid)</p>\n";
 		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
 
-		// do that group is a groupOfNames?
-		if (is_null($groupOfNames)) $groupOfNames = $this->id2name($gid,'groupOfNames');
+		// do that group is a groupOf(Unique)Names or univentionGroup?
+		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
 
 		$to_write = array('memberuid' => array());
 		foreach((array)$members as $key => $member)
 		{
+			$member_dn = $this->id2name($member, 'account_dn');
 			if (is_numeric($member)) $member = $this->id2name($member);
 
 			if ($member)
 			{
 				$to_write['memberuid'][] = $member;
-				if ($groupOfNames) $to_write['member'][] = 'uid='.$member.','.$this->user_context;
+				if (in_array('groupofnames', $objectclass))
+				{
+					$to_write['member'][] = $member_dn;
+				}
+				if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass))
+				{
+					$to_write['uniquemember'][] = $member_dn;
+				}
 			}
 		}
-		if ($groupOfNames && !$to_write['member'])
+		// hack as groupOfNames requires the member attribute
+		if (in_array('groupofnames', $objectclass) && !$to_write['member'])
 		{
-			// hack as groupOfNames requires the member attribute
 			$to_write['member'][] = 'uid=dummy'.','.$this->user_context;
 		}
+		if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass) && !$to_write['uniquemember'])
+		{
+			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
+		}
 		if ($use_cn) return $to_write;
 
 		// set the member email addresses as forwards
@@ -1091,10 +1137,13 @@ class accounts_ldap
 			if (is_array($forward)) list($forward,$extra_attr) = $forward;
 			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
 
-			$to_write[$forward] = array();
-			foreach($members as $key => $member)
+			if ($forward)
 			{
-				if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+				$to_write[$forward] = array();
+				foreach($members as $key => $member)
+				{
+					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+				}
 			}
 		}
 		if (!ldap_modify($this->ds,'cn='.ldap::quote($cn).','.$this->group_context,$to_write))

From 063f034e20782eef06621bd88abfbed8967bee06 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 30 Oct 2014 15:23:09 +0000
Subject: [PATCH 22/44] Open customfields edit dialog as
 popupinc/class.customfields.inc.php

---
 json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/json.php b/json.php
index 28736362dd..a656cd118d 100644
--- a/json.php
+++ b/json.php
@@ -64,7 +64,7 @@ function ajax_exception_handler(Exception $e)
 }
 
 // set our own exception handler, to not get the html from eGW's default one
-set_exception_handler('ajax_exception_handler');
+//set_exception_handler('ajax_exception_handler');
 
 if (isset($_GET['menuaction']))
 {

From 686d424e58ddc15020b399f54b743814fe4b77b7 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 30 Oct 2014 15:24:05 +0000
Subject: [PATCH 23/44] Open customfields edit dialog as popup

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

diff --git a/admin/inc/class.customfields.inc.php b/admin/inc/class.customfields.inc.php
index 8a2d2fca74..8d51cc4ca6 100644
--- a/admin/inc/class.customfields.inc.php
+++ b/admin/inc/class.customfields.inc.php
@@ -371,7 +371,7 @@ class customfields
 			'cf_id' => $cf_id,
 			'cf_app' => $this->appname,
 			'use_private' => $this->use_private,
-		));
+		),2);
 	}
 
 	/**

From 0c5eb748056ebe10f41e86ea1317f18799ac5ad9 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 30 Oct 2014 15:33:00 +0000
Subject: [PATCH 24/44] Revert the not wanted commit r49258

---
 json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/json.php b/json.php
index a656cd118d..28736362dd 100644
--- a/json.php
+++ b/json.php
@@ -64,7 +64,7 @@ function ajax_exception_handler(Exception $e)
 }
 
 // set our own exception handler, to not get the html from eGW's default one
-//set_exception_handler('ajax_exception_handler');
+set_exception_handler('ajax_exception_handler');
 
 if (isset($_GET['menuaction']))
 {

From 525db32b59d694a33bfcab70d40f746be7854c43 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 16:49:56 +0000
Subject: [PATCH 25/44] fix always shown horizontal scrollbar

---
 preferences/templates/default/settings.xet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/preferences/templates/default/settings.xet b/preferences/templates/default/settings.xet
index b76fe3684c..c0408641e2 100644
--- a/preferences/templates/default/settings.xet
+++ b/preferences/templates/default/settings.xet
@@ -38,7 +38,7 @@
 				<template id="preferences.settings.tab1" content="tab1"/>
 			</tabpanels>
 		</tabbox>
-		<hbox class="dialogFooterToolbar" width="100%">
+		<hbox class="dialogFooterToolbar">
 			<button label="Save" id="button[save]"/>
 			<button label="Apply" id="button[apply]"/>
 			<button label="Cancel" id="button[cancel]" onclick="window.close();"/>

From 9a7d087824d3800ffb2eb211ec13f3fed29f6175 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 30 Oct 2014 22:14:07 +0000
Subject: [PATCH 26/44] Fix missing icon for link action

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

diff --git a/etemplate/js/et2_extension_nextmatch_controller.js b/etemplate/js/et2_extension_nextmatch_controller.js
index 2058344f72..5a8b73387b 100644
--- a/etemplate/js/et2_extension_nextmatch_controller.js
+++ b/etemplate/js/et2_extension_nextmatch_controller.js
@@ -275,7 +275,7 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider,
 		if(drop_action == null)
 		{
 			// Create the drop action that links entries
-			drop_action = mgr.addAction('drop', 'egw_link_drop', this.egw.lang('link'), 'link', function(action, source, dropped) {
+			drop_action = mgr.addAction('drop', 'egw_link_drop', this.egw.lang('Create link'), egw.image('link'), function(action, source, dropped) {
 				// Extract link IDs
 				var links = [];
 				var id = '';

From 6272b57088d563eed95dc87b3fda8ba4e29c8a74 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 30 Oct 2014 22:18:37 +0000
Subject: [PATCH 27/44] * Context menu items to copy and paste for drag and
 drop actions

Copy action is enabled when there are drag actions defined.
Paste action is enabled when there are drop actions defined that match the clipboard context.
Current clipboard contents can be seen in the tooltip for the paste action.
---
 phpgwapi/js/egw_action/egw_action_popup.js | 154 +++++++++++++++++++++
 1 file changed, 154 insertions(+)

diff --git a/phpgwapi/js/egw_action/egw_action_popup.js b/phpgwapi/js/egw_action/egw_action_popup.js
index ca03fc24b7..64b5f186cf 100644
--- a/phpgwapi/js/egw_action/egw_action_popup.js
+++ b/phpgwapi/js/egw_action/egw_action_popup.js
@@ -536,6 +536,9 @@ function egwPopupActionImplementation()
 		// Build a tree containing all actions
 		var tree = {"root": []};
 
+		// Automatically add in Drag & Drop actions
+		this._addCopyPaste(_links,_selected);
+
 		for (var k in _links)
 		{
 			_links[k].actionObj.appendToTree(tree);
@@ -572,6 +575,157 @@ function egwPopupActionImplementation()
 		return {'posx': (event.clientX + scrollLeft), 'posy': (event.clientY + scrollTop)};
 	};
 
+	/**
+	 * Automagically add in context menu items for copy and paste from
+	 * drag and drop actions, based on current clipboard and the accepted types
+	 *
+	 * @param {object[]} _links Actions for inclusion in the menu
+	 * @param {egwActionObject[]} _selected Currently selected entries
+	 */
+	ai._addCopyPaste = function (_links, _selected)
+	{
+		// Get a list of drag & drop actions
+		var drag = _selected[0].getSelectedLinks('drag').links;
+		var drop = _selected[0].getSelectedLinks('drop').links;
+
+		// No drags & no drops means early exit
+		if((!drag || jQuery.isEmptyObject(drag)) && (!drop || jQuery.isEmptyObject(drop)))
+		{
+			return;
+		}
+
+		// Find existing actions so we don't get copies
+		var mgr = _selected[0].manager;
+		var copy_action = mgr.getActionById('egw_copy');
+		var paste_action = mgr.getActionById('egw_paste');
+
+		// Create default copy menu action
+		if(drag && !jQuery.isEmptyObject(drag))
+		{
+			// Don't re-add if it's there
+			if(copy_action == null)
+			{
+				// Create a drag action that allows linking
+				copy_action = mgr.addAction('popup', 'egw_copy', egw.lang('Copy to clipboard'), egw.image('copy'), function(action, selected) {
+					// Copied, now add to clipboard
+					var clipboard = {
+						type:[],
+						selected:[]
+					}
+
+					// When pasting we need to know the type of drag
+					for(var k in drag)
+					{
+						if(drag[k].enabled && drag[k].actionObj.dragType.length > 0)
+						{
+							clipboard.type = clipboard.type.concat(drag[k].actionObj.dragType);
+						}
+					}
+					// egwAction is a circular structure and can't be stringified so just take what we want
+					// Hopefully that's enough for the action handlers
+					for(var k in selected)
+					{
+						if(selected[k].id) clipboard.selected.push({id:selected[k].id, data:selected[k].data})
+					}
+
+					// Save it in session
+					egw.setSessionItem('phpgwapi', 'egw_clipboard', JSON.stringify(clipboard));
+				},true);
+				copy_action.group = 1.5;
+			}
+			if(typeof _links[copy_action.id] == 'undefined')
+			{
+				_links[copy_action.id] = {
+					"actionObj": copy_action,
+					"enabled": true,
+					"visible": true,
+					"cnt": 0
+				};
+			}
+		}
+
+		// Create default paste menu item
+		if(drop && !jQuery.isEmptyObject(drop))
+		{
+			// Create paste action
+			// This injects the clipboard data and calls the original handler
+			var paste_exec = function(action, selected) {
+				// Add in clipboard as a sender
+				var clipboard = JSON.parse(egw.getSessionItem('phpgwapi', 'egw_clipboard'));
+				drop[action.id].actionObj.execute(clipboard.selected,selected[0]);
+			};
+
+			var clipboard = JSON.parse(egw.getSessionItem('phpgwapi', 'egw_clipboard'));
+
+			// Don't re-add if action already exists
+			if(paste_action == null)
+			{
+				paste_action = mgr.addAction('popup', 'egw_paste', egw.lang('Paste'), egw.image('editpaste'), paste_exec,true);
+				paste_action.group = 1.5;
+				paste_action.canHaveChildren.push('drop');
+			}
+
+			// Set hint to something resembling current clipboard
+			var hint = egw.lang('Clipboard') + ":\n[" + clipboard.type.join(',')+"]\n";
+			paste_action.set_hint(hint);
+			// Add titles of entries
+			for(var i = 0; i < clipboard.selected.length; i++)
+			{
+				var id = clipboard.selected[i].id.split('::');
+				egw.link_title(id[0],id[1],function(title) {if(title)this.hint += title+"\n";},paste_action);
+			}
+
+			// Add into links so it's included in menu
+			if(typeof _links[paste_action.id] == 'undefined')
+			{
+				_links[paste_action.id] = {
+					"actionObj": paste_action,
+					"enabled": false,
+					"visible": clipboard != null,
+					"cnt": 0
+				};
+			}
+			while(paste_action.children.length > 0)
+			{
+				paste_action.children[0].remove();
+			}
+
+			// If nothing [valid] in the clipboard, don't bother with children
+			if(clipboard == null || typeof clipboard.type != 'object')
+			{
+				return;
+			}
+
+			// Add in actual actions as children
+			for(var k in drop)
+			{
+				// Add some choices - need to be a copy, or they interfere with
+				// the original
+				var drop_clone = jQuery.extend({},drop[k].actionObj);
+				drop_clone.parent = paste_action;
+				drop_clone.onExecute = new egwFnct(this, null, []);
+				drop_clone.set_onExecute(paste_exec);
+				paste_action.children.push(drop_clone);
+				paste_action.allowOnMultiple = paste_action.allowOnMultiple && drop_clone.allowOnMultiple;
+				_links[k] = jQuery.extend({},drop[k]);
+				_links[k].actionObj = drop_clone;
+
+				// Drop is allowed if clipboard types intersect drop types
+				_links[k].enabled = false;
+				_links[k].visible = false;
+				for (var i = 0; i < drop_clone.acceptedTypes.length; i++)
+				{
+					if (clipboard.type.indexOf(drop_clone.acceptedTypes[i]) != -1)
+					{
+						_links[paste_action.id].enabled = true;
+						_links[k].enabled = true;
+						_links[k].visible = true;
+						break;
+					}
+				}
+			}
+		}
+	};
 	return ai;
 }
 

From 8abbf0d20e0a2c2a23e1545dbb1f56b8422d72a3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 31 Oct 2014 08:31:23 +0000
Subject: [PATCH 28/44] fix can not access property type of null, stalling
 context menu on tree

---
 phpgwapi/js/egw_action/egw_action_popup.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/js/egw_action/egw_action_popup.js b/phpgwapi/js/egw_action/egw_action_popup.js
index 64b5f186cf..67c8d2a1dc 100644
--- a/phpgwapi/js/egw_action/egw_action_popup.js
+++ b/phpgwapi/js/egw_action/egw_action_popup.js
@@ -611,7 +611,7 @@ function egwPopupActionImplementation()
 					var clipboard = {
 						type:[],
 						selected:[]
-					}
+					};
 
 					// When pasting we need to know the type of drag
 					for(var k in drag)
@@ -625,7 +625,7 @@ function egwPopupActionImplementation()
 					// Hopefully that's enough for the action handlers
 					for(var k in selected)
 					{
-						if(selected[k].id) clipboard.selected.push({id:selected[k].id, data:selected[k].data})
+						if(selected[k].id) clipboard.selected.push({id:selected[k].id, data:selected[k].data});
 					}
 
 					// Save it in session
@@ -655,7 +655,10 @@ function egwPopupActionImplementation()
 				drop[action.id].actionObj.execute(clipboard.selected,selected[0]);
 			};
 
-			var clipboard = JSON.parse(egw.getSessionItem('phpgwapi', 'egw_clipboard'));
+			var clipboard = JSON.parse(egw.getSessionItem('phpgwapi', 'egw_clipboard')) || {
+				type:[],
+				selected:[]
+			};
 
 			// Don't re-add if action already exists
 			if(paste_action == null)

From f3dd3c2c0b7cc05df98085deee4ffcb73a8e50f4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 31 Oct 2014 10:12:53 +0000
Subject: [PATCH 29/44] setting white-space:nowrap on et2_tabheader so
 tab-flags do not wrap into 2. line and remove no_wrap class from addressbook
 tab-widget, as it prevents wrapping of everything incl. content in individual
 tabs

---
 addressbook/templates/default/edit.xet     | 2 +-
 etemplate/templates/default/etemplate2.css | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index d700332ab1..e3d92866e4 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -394,7 +394,7 @@
 					<description/>
 				</row>
 				<row>
-					<tabbox id="tabs" class="et2_nowrap" span="all" width="100%">
+					<tabbox id="tabs" span="all" width="100%">
 						<tabs>
 							<tab id="general" label="Organisation"/>
 							<tab id="home" label="Private" statustext="Home address, Birthday, ..."/>
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 9a4998bfde..93b882bea2 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -795,6 +795,7 @@ ul.et2_link_string {
   background-image: url(images/tab_header_bg.png);
   background-position: bottom;
   background-repeat: repeat-x;
+  white-space: nowrap;
 }
 .et2_taglist_ro ul {
   margin: 0px;
@@ -1690,7 +1691,7 @@ table.et2_egw_action_ddHelper_row img {
 }
 /* Last row of items which shows the number of more items*/
 tr.et2_egw_action_ddHelper_moreRow{
-    
+
 }
 /* The big total item counter*/
 span.et2_egw_action_ddHelper_itemsCnt {

From 795131df35c4ac92c617dafaef5b220937f1a811 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 31 Oct 2014 10:49:22 +0000
Subject: [PATCH 30/44] Fix re-positioning mail preview content according to
 its visible sibilings

---
 mail/js/app.js                  | 42 +++++++++++++++++++--------------
 mail/templates/default/app.css  |  6 -----
 mail/templates/pixelegg/app.css |  6 -----
 3 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 4def2c5a05..c88800743a 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -758,31 +758,37 @@ app.classes.mail = AppJS.extend(
 		//dataElem.data is populated, when available with fromaddress(string),toaddress(string),additionaltoaddress(array),ccaddress (array)
 		var dataElem = {data:{subject:"",fromaddress:"",toaddress:"",ccaddress:"",date:"",attachmentsBlock:""}};
 		var attachmentArea = this.et2.getWidgetById('previewAttachmentArea');
-		var previewContainer = this.et2.getWidgetById('mailPreviewContainer');
 		if(typeof selected != 'undefined' && selected.length == 1)
 		{
 			var _id = this.mail_fetchCurrentlyFocussed(selected);
 			dataElem = jQuery.extend(dataElem, egw.dataGetUIDdata(_id));
 		}
-
+		
+		var $preview_iframe = jQuery('#mail-index_mailPreviewContainer');
+		
+		// Re calculate the position of preview iframe according to its visible sibilings
+		var set_prev_iframe_top = function ()
+		{
+			// Need to make sure that the iframe is fullyLoad before calculation
+			window.setTimeout(function(){
+				var lastEl = $preview_iframe.prev().prev();
+				// Top offset of preview iframe calculated from top level
+				var iframeTop = $preview_iframe.offset().top;
+				while (lastEl.css('display') === "none")
+				{
+					lastEl = lastEl.prev();
+				}
+				var offset = iframeTop - (lastEl.offset().top + lastEl.height()) || 130; // fallback to 130 px if can not calculate new top
+				
+				// preview iframe parent has position absolute, therefore need to calculate the top via position
+				$preview_iframe.css ('top', $preview_iframe.position().top - offset + 10);
+			}, 50);
+		}
+		
 		if (attachmentArea && typeof _id != 'undefined' && _id !='' && typeof dataElem !== 'undefined')
 		{
-			this.et2.getWidgetById('previewAttachmentArea').set_class('previewAttachmentArea');
-			if (!dataElem.data.attachmentsBlock)
-			{
-				if (!dataElem.data.ccaddress)
-				{
-					previewContainer.set_class('previewNoAttachment');
-				}
-				else
-				{
-					previewContainer.set_class('previewNoAttachmentButCC');
-				}
-			}
-			else
-			{
-				jQuery(previewContainer.node).removeClass('previewNoAttachment previewNoAttachmentButCC');
-			}
+			// If there is content to show recalculate the size
+			set_prev_iframe_top();
 		}
 		else
 		{
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index ff31479230..16a9569191 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -502,12 +502,6 @@ div.mail-compose_fileselector {
 	left: 3px;
 	right: 0;
 }
-#mail-index_mailPreviewContainer.previewNoAttachment {
-	top: 51px;
-}
-#mail-index_mailPreviewContainer.previewNoAttachmentButCC{
-	top: 67px;
-}
 #mail-index_previewAttachmentArea {
 	background-color:#f0f0f0;
 	max-height: 1.6em;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index cec3ee6956..fedea2b17d 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -502,12 +502,6 @@ div.mail-compose_fileselector {
   left: 3px;
   right: 0;
 }
-#mail-index_mailPreviewContainer.previewNoAttachment {
-  top: 51px;
-}
-#mail-index_mailPreviewContainer.previewNoAttachmentButCC {
-  top: 67px;
-}
 #mail-index_previewAttachmentArea {
   background-color: #f0f0f0;
   max-height: 1.6em;

From 99895e0dd9ea9228eb71bf8e5f01cb85fca7b5e8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 31 Oct 2014 12:23:56 +0000
Subject: [PATCH 31/44] only register hooks of installed apps, not all existing
 in filesystem, fixes fatal errors resulting from not installed apps

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

diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index 2511fbb203..033fea31cf 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -329,8 +329,15 @@ class hooks
 		// deleting hooks, to get ride of no longer existing apps
 		$this->db->delete($this->table,'1=1',__LINE__,__FILE__);
 
+		// if we run in setup, we need to read installed apps first
+		if (!$GLOBALS['egw_info']['apps'])
+		{
+			$applications = new applications();
+			$applications->read_installed_apps();
+		}
+
 		// now register all apps using just filesystem data
-		foreach(scandir(EGW_SERVER_ROOT) as $appname)
+		foreach(array_keys($GLOBALS['egw_info']['apps']) as $appname)
 		{
 			if ($appname[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$appname)) continue;
 

From fd37251ac441d35b704e4f038d29aa61c3c7df84 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 31 Oct 2014 15:31:32 +0000
Subject: [PATCH 32/44] setting sambaPrimaryGroupSID and univentionObject with
 univentionObjectType

---
 phpgwapi/inc/class.accounts_ldap.inc.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index e51b1134c5..d64246a540 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -83,13 +83,14 @@ class accounts_ldap
 			'top','person','organizationalperson','inetorgperson','posixaccount','shadowaccount'
 		),
 		'user-if-supported' => array(	// these classes get added, if server supports them
-			'mozillaabpersonalpha','mozillaorgperson','evolutionperson','univentionperson'
+			'mozillaabpersonalpha', 'mozillaorgperson', 'evolutionperson',
+			'univentionperson', array('univentionobject', 'univentionObjectType' => 'users/user'),
 		),
 		'group' => array(
 			'top','posixgroup','groupofnames'
 		),
 		'group-if-supported' => array(	// these classes get added, if servers supports them
-			'univentiongroup',
+			'univentiongroup', array('univentionobject', 'univentionObjectType' => 'groups/group'),
 		)
 	);
 	/**
@@ -255,9 +256,16 @@ class accounts_ldap
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
 				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
 				{
+					$add = array();
+					if (is_array($additional))
+					{
+						$add = $additional;
+						$additional = array_shift($add);
+					}
 					if ($this->ldapServerInfo->supportsObjectClass($additional))
 					{
 						$to_write['objectclass'][] = $additional;
+						if ($add) $to_write += $add;
 					}
 				}
 			}

From f0344d83e02e4d40fee125415bd592587ae82964 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 31 Oct 2014 16:50:37 +0000
Subject: [PATCH 33/44] automatic install in UCS enviroment

---
 doc/rpm-build/post_install.php | 110 +++++++++++++++++++++++++++++++--
 1 file changed, 106 insertions(+), 4 deletions(-)

diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php
index 6100f62c8f..c900511349 100755
--- a/doc/rpm-build/post_install.php
+++ b/doc/rpm-build/post_install.php
@@ -11,7 +11,7 @@
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling post_install as web-page
 {
-	die('<h1>rpm_post_install.php must NOT be called as web-page --> exiting !!!</h1>');
+	die('<h1>post_install.php must NOT be called as web-page --> exiting !!!</h1>');
 }
 $verbose = false;
 $config = array(
@@ -55,6 +55,8 @@ $config = array(
 	'ldap_context'  => 'ou=accounts,$base',
 	'ldap_search_filter' => '(uid=%user)',
 	'ldap_group_context' => 'ou=groups,$base',
+	'ldap_encryption_type' => '',
+	'sambaadmin/sambaSID'=> '',	// SID for sambaadmin
 	'mailserver'    => '',
 	'smtpserver'    => 'localhost,25',
 	'smtp'          => '',	// see setup-cli.php --help config
@@ -88,8 +90,11 @@ function set_distro_defaults($distro=null)
 	global $config;
 	if (is_null($distro))
 	{
-		$distro = file_exists('/etc/SuSE-release') ? 'suse' : (file_exists('/etc/debian_version') ? 'debian' :
-			(file_exists('/etc/mandriva-release') ? 'mandriva' : 'rh'));
+		$distro = file_exists('/etc/SuSE-release') ? 'suse' :
+			(file_exists('/etc/mandriva-release') ? 'mandriva' :
+			(file_exists('/etc/lsb-release') && preg_match('/^DISTRIB_ID="Univention"$/mi',
+				file_get_contents('/etc/lsb-release')) ? 'univention' :
+			(file_exists('/etc/debian_version') ? 'debian' : 'rh')));
 	}
 	switch (($config['distro'] = $distro))
 	{
@@ -141,6 +146,9 @@ function set_distro_defaults($distro=null)
 			$config['ldap_context'] = 'ou=People,$base';
 			$config['ldap_group_context'] = 'ou=Group,$base';
 			break;
+		case 'univention':
+			set_univention_defaults();
+			break;
 		default:
 			$config['distro'] = 'rh';
 			// fall through
@@ -293,6 +301,7 @@ if (!file_exists($config['header']) || filesize($config['header']) < 200)	// def
 		foreach(array(
 			'domain','ldap_suffix','ldap_host','ldap_admin','ldap_admin_pw',	// non-egw params: only used for create
 			'ldap_base','ldap_root_dn','ldap_root_pw','ldap_context','ldap_search_filter','ldap_group_context',	// egw params
+			'ldap_encryption_type', 'sambaadmin/sambaSID',
 		) as $name)
 		{
 			if (strpos($value=$config[$name],'$') !== false)
@@ -551,7 +560,7 @@ function usage($error=null)
 	foreach($config as $name => $default)
 	{
 		if (in_array($name, array('postfix','cyrus'))) continue;	// do NOT report deprecated options
-		if (in_array($name,array('config_passwd','db_pass','admin_passwd','ldap_root_pw')))
+		if (in_array($name,array('config_passwd','db_pass','admin_passwd','ldap_root_pw')) && strlen($config[$name]) == 16)
 		{
 			$default = '<16 char random string>';
 		}
@@ -724,3 +733,96 @@ function fix_perms()
 		system('/bin/chmod 700 /tmp/egw_cache');
 	}
 }
+
+/**
+ * Set Univention UCS specific defaults
+ *
+ * Defaults are read from ucr registry and /etc/*.secret files
+ */
+function set_univention_defaults()
+{
+	global $config;
+
+	set_distro_defaults('debian');
+	$config['distro'] = 'univention';
+
+	// mysql settings
+	$config['db_root_pw'] = _ucr_secret('mysql');
+
+	// check if ucs ldap server is configured
+	if (_ucr_get('ldap/server/ip'))
+	{
+		// ldap settings, see http://docs.univention.de/developer-reference-3.2.html#join:secret
+		$config['ldap_suffix'] = $config['ldap_base'] = _ucr_get('ldap/base');
+		$config['ldap_host'] = 'tls://'._ucr_get('ldap/server/ip').':'._ucr_get('ldap/server/port');
+		$config['ldap_admin'] = $config['ldap_root'] = 'cn=admin,$suffix';
+		$config['ldap_admin_pw'] = $config['ldap_root_pw'] = _ucr_secret('ldap');
+		$config['ldap_context'] = 'cn=users,$base';
+		$config['ldap_group_context'] = 'cn=groups,$base';
+		$config['ldap_search_filter'] = '(uid=%user)';
+
+		// ldap password hash (our default blowfish_crypt seems not to work)
+		$config['ldap_encryption_type'] = 'sha512_crypt';
+
+		$config['account_min_id'] = 1200;	// UCS use 11xx for internal users/groups
+
+		$config['account-auth'] = 'ldap';
+
+		// set sambaadmin sambaSID
+		$config['sambaadmin/sambaSID'] = exec('/usr/bin/univention-ldapsearch -x "(objectclass=sambadomain)" sambaSID|sed -n "s/sambaSID: \(.*\)/\1/p"');
+
+		// mailserver, see setup-cli.php --help config
+		if (_ucr_get('mail/cyrus/imap') == 'yes' && ($domains=_ucr_get('mail/hosteddomains')))
+		{
+			if (!is_array($domains)) $domains = explode("\n", $domains);
+			$domain = array_shift($domains);
+			$config['smtpserver'] = 'localhost,465,,,yes,tls';
+			$config['smtp'] = 'no,emailadmin_smtp_ldap_univention';
+			$config['mailserver'] = "localhost,993,$domain,email,tls";
+			$config['imap'] = 'root,'._ucr_secret('cyrus').',emailadmin_imap_cyrus';
+			if (($sieve_port = _ucr_get('mail/cyrus/sieve/port')))
+			{
+				$config['sieve'] = 'localhost,'.$sieve_port.',starttls';
+			}
+		}
+	}
+}
+
+/**
+ * Get a value from Univention registry
+ *
+ * @param string $name
+ * @return string
+ */
+function _ucr_get($name)
+{
+	static $values=null;
+	if (!isset($values))
+	{
+		$output = $matches = null;
+		exec('/usr/sbin/ucr dump', $output);
+		foreach($output as $line)
+		{
+			if (preg_match("/^([^:]+): (.*)\n?$/", $line, $matches))
+			{
+				$values[$matches[1]] = $matches[2];
+			}
+		}
+	}
+	return $values[$name];
+}
+
+/**
+ * Read one Univention secret/password eg. _ucr_secret('mysql')
+ *
+ * @param string $name
+ * @return string|boolean
+ */
+function _ucr_secret($name)
+{
+	if (!file_exists($filename = '/etc/'.basename($name).'.secret'))
+	{
+		return false;
+	}
+	return trim(file_get_contents($filename));
+}

From 3d411f82daecde67e2fe8418d948bdb16baf14bc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 3 Nov 2014 13:51:05 +0000
Subject: [PATCH 34/44] * ProjectManager/Timesheet: fixed an infinit loop when
 trying to save a project-element, caused by timesheet notifying project again

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

diff --git a/timesheet/inc/class.timesheet_bo.inc.php b/timesheet/inc/class.timesheet_bo.inc.php
index 85d1787de1..3e082627fb 100644
--- a/timesheet/inc/class.timesheet_bo.inc.php
+++ b/timesheet/inc/class.timesheet_bo.inc.php
@@ -972,7 +972,8 @@ class timesheet_bo extends so_sql_cf
 			if (isset($update))
 			{
 				$this->update($update);
-				egw_link::notify_update(TIMESHEET_APP, $this->data['ts_id'],$this->data);
+				// do NOT notify about title-change, as this will lead to an infinit loop!
+				// egw_link::notify_update(TIMESHEET_APP, $this->data['ts_id'],$this->data);
 				//error_log(__METHOD__."() setting pm_id=$pm_id --> ".array2string($update));
 			}
 		}

From 382d7bc762479804d6a29facc611b468e50cab5d Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 3 Nov 2014 17:12:44 +0000
Subject: [PATCH 35/44] Get infolog status icons showing in element list.

---
 infolog/inc/class.infolog_bo.inc.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index d9af6ab04a..aec5c827fa 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -1413,6 +1413,8 @@ class infolog_bo
 				$infos[$row['info_id']] = array(
 					'status' => $row['info_type'] != 'phone' && $row['info_status'] == 'ongoing' ?
 						$row['info_percent'].'%' : 'infolog/'.$this->status[$row['info_type']][$row['info_status']],
+					'status_icon' => $row['info_type'] != 'phone' && $row['info_status'] == 'ongoing' ?
+						'ongoing' : 'infolog/'.$row['info_status'],
 					'class'  => $row['info_id_parent'] ? 'infolog_rowHasParent' : null,
 				);
 				if (common::image('infolog', $icon=$row['info_type'].'_element') ||

From 975a3fd2d5f2391c4c9dbc221978eeed2e5f2d6b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 4 Nov 2014 13:18:20 +0000
Subject: [PATCH 36/44] Fix placeholder in taglist

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

diff --git a/etemplate/js/et2_widget_taglist.js b/etemplate/js/et2_widget_taglist.js
index f45faed1d5..15aa3efffb 100644
--- a/etemplate/js/et2_widget_taglist.js
+++ b/etemplate/js/et2_widget_taglist.js
@@ -160,7 +160,7 @@ var et2_taglist = et2_selectbox.extend(
 			method: 'GET',
 			displayField: "label",
 			invalidCls: 'invalid ui-state-error',
-			emptyText: this.options.empty_label,
+			placeholder: this.options.empty_label,
 			hideTrigger: true,
 			noSuggestionText: this.egw().lang("No suggestions"),
 			required: this.options.required,

From ca142a8734a212f8be61ca7a713477b2f41822bd Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 4 Nov 2014 15:34:51 +0000
Subject: [PATCH 37/44] Style print view of calendar entry -Fix None blocking,
 whole day, and private options weird behavior in print view.

---
 calendar/templates/default/app.css            | 18 ++++++++++
 .../templates/default/print.participants.xet  | 36 -------------------
 calendar/templates/default/print.xet          | 35 +++++++++---------
 calendar/templates/pixelegg/app.css           | 19 ++++++++++
 4 files changed, 56 insertions(+), 52 deletions(-)
 delete mode 100644 calendar/templates/default/print.participants.xet

diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index e3ec16fe0c..91bfc26327 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1,5 +1,18 @@
 /* $Id$ */
 
+/*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;
+	}
+}
+
 /* Header classes */
 tr.dialogHeader td, tr.dialogHeader2 td, tr.dialogHeader3 td, tr.dialogHeader4 td,
 tr.dialogOperators td,.dialogFooterToolbar {
@@ -632,3 +645,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .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;
+}
\ No newline at end of file
diff --git a/calendar/templates/default/print.participants.xet b/calendar/templates/default/print.participants.xet
deleted file mode 100644
index 6b841d9f27..0000000000
--- a/calendar/templates/default/print.participants.xet
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id$ -->
-<overlay>
-	<template id="calendar.print.participants" template="" lang="" group="0" version="1.6.001">
-		<grid width="100%" height="200" overflow="auto" id="participants">
-			<columns>
-				<column width="95"/>
-				<column/>
-				<column/>
-				<column disabled="@hide_status_recurrence"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<description span="all"/>
-				</row>
-				<row class="th">
-					<description value="Type"/>
-					<description value="Participants"/>
-					<description value="Quantity"/>
-					<description value="All future"/>
-					<description value="Status"/>
-				</row>
-				<row valign="top">
-					<description id="${row}[app]"/>
-					<description rows="1" cols="2" id="${row}[title]" no_lang="1"/>
-					<int id="${row}[quantity]" options="1,,3" readonly="true"/>
-					<checkbox id="${row}[status_recurrence]" align="center" readonly="true"/>
-					<menulist>
-						<menupopup id="${row}[status]" no_lang="1" onchange="1"/>
-					</menulist>
-				</row>
-			</rows>
-		</grid>
-	</template>
-</overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/print.xet b/calendar/templates/default/print.xet
index 974f5a33a7..71f3014187 100644
--- a/calendar/templates/default/print.xet
+++ b/calendar/templates/default/print.xet
@@ -40,7 +40,7 @@
 				<column/>
 			</columns>
 			<rows>
-				<row class="th">
+				<row class="th" height="28">
 					<description span="all" value="Existing links"/>
 				</row>
 				<row class="row_off" valign="top">
@@ -57,20 +57,23 @@
 					<column/>
 				</columns>
 				<rows>
-					<row class="th">
-						<image src="print" onclick="window.print();"/>
-						<description class="bold" value="Calendar" options="bold"/>
+					<row>
+						<hbox>
+							<image src="print" onclick="window.print();" class="calendar_print_button"/>
+							<appicon class="calendar_print_appicon"/>
+						</hbox>
 					</row>
 					<row class="th" height="28">
-						<description value="Title"/>
-						<textbox id="title" size="80" maxlength="255" readonly="true" span="all"/>
+						<description value="Title" class="bold" options="bold"/>
+						<textbox id="title" size="80" maxlength="255" readonly="true" span="all" class="bold"/>
 					</row>
 					<row class="row">
 						<description width="95" options=",,,start" value="Start"/>
-						<hbox options="0,0">
-							<date-time id="start" readonly="true"/>
-							<checkbox label="whole day" id="whole_day" options=",, ,disable" statustext="Event will occupy the whole day" align="center" readonly="true"/>
-						</hbox>
+						<date-time id="start" readonly="true"/>
+					</row>
+					<row class="row">
+						<description width="0" options=",,,whole_day" value="whole day"/>
+						<checkbox id="whole_day" options=",, ," statustext="Event will occupy the whole day" readonly="true"/>
 					</row>
 					<row class="row">
 						<description width="0" options=",,,duration" value="Duration"/>
@@ -85,21 +88,21 @@
 						<description options=",,,location" value="Location" width="0"/>
 						<textbox maxlength="255" id="location" class="calendar_inputFullWidth" readonly="true"/>
 					</row>
-					<row class="row_off">
+					<row class="row">
 						<description options=",,,priority" value="Priority" width="0"/>
 						<menulist>
 							<menupopup type="select-priority" id="priority" readonly="true"/>
 						</menulist>
 					</row>
 					<row class="row">
-						<description value="Options" width="0"/>
-						<checkbox id="non_blocking" options=",, ,disable" statustext="A non blocking event will not conflict with other events" label="non blocking" readonly="true"/>
+						<description value="Non blocking" width="0"/>
+						<checkbox id="non_blocking" options="1,0, ," statustext="A non blocking event will not conflict with other events" readonly="true"/>
 					</row>
 					<row class="row">
-						<description/>
-						<checkbox id="public" options="0,1" label="Private" readonly="true"/>
+						<description value="Private"/>
+						<checkbox id="public" options="0,1" readonly="true"/>
 					</row>
-					<row class="row">
+					<row class="row calendar_print_cat">
 						<description value="Categories"/>
 						<menulist>
 							<menupopup type="select-cat" id="category" readonly="true"/>
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 5cea362c9e..7e5b467e45 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -12,6 +12,20 @@
  * @version $Id$
  */
 /* $Id: app.css 48463 2014-09-04 13:37:46Z ralfbecker $ */
+/*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;
+  }
+}
 /* Header classes */
 tr.dialogHeader td,
 tr.dialogHeader2 td,
@@ -641,6 +655,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_freetime_dow {
   position: absolute;
 }
+img.calendar_print_button,
+img.calendar_print_appicon {
+  height: 24px;
+  width: 24px;
+}
 /*generell*/
 .egw_fw_content_browser_iframe img[src$="svg"] {
   background-color: #828282 !important;

From 0f516f9eb72e5e0f3a14caa9e3af819220a42191 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 4 Nov 2014 21:34:18 +0000
Subject: [PATCH 38/44] Add action to add to clipboard

---
 phpgwapi/js/egw_action/egw_action_popup.js | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/phpgwapi/js/egw_action/egw_action_popup.js b/phpgwapi/js/egw_action/egw_action_popup.js
index 67c8d2a1dc..82252e173e 100644
--- a/phpgwapi/js/egw_action/egw_action_popup.js
+++ b/phpgwapi/js/egw_action/egw_action_popup.js
@@ -597,6 +597,7 @@ function egwPopupActionImplementation()
 		// Find existing actions so we don't get copies
 		var mgr = _selected[0].manager;
 		var copy_action = mgr.getActionById('egw_copy');
+		var add_action = mgr.getActionById('egw_copy_add');
 		var paste_action = mgr.getActionById('egw_paste');
 
 		// Create default copy menu action
@@ -621,6 +622,7 @@ function egwPopupActionImplementation()
 							clipboard.type = clipboard.type.concat(drag[k].actionObj.dragType);
 						}
 					}
+					clipboard.type = jQuery.unique(clipboard.type);
 					// egwAction is a circular structure and can't be stringified so just take what we want
 					// Hopefully that's enough for the action handlers
 					for(var k in selected)
@@ -633,6 +635,38 @@ function egwPopupActionImplementation()
 				},true);
 				copy_action.group = 1.5;
 			}
+			if(add_action == null)
+			{
+				// Create an action to add selected to clipboard
+				add_action = mgr.addAction('popup', 'egw_copy_add', egw.lang('Add to clipboard'), egw.image('copy'), function(action, selected) {
+					// Copied, now add to clipboard
+					var clipboard = JSON.parse(egw.getSessionItem('phpgwapi', 'egw_clipboard')) || {
+						type:[],
+						selected:[]
+					};
+
+					// When pasting we need to know the type of drag
+					for(var k in drag)
+					{
+						if(drag[k].enabled && drag[k].actionObj.dragType.length > 0)
+						{
+							clipboard.type = clipboard.type.concat(drag[k].actionObj.dragType);
+						}
+					}
+					clipboard.type = jQuery.unique(clipboard.type);
+					// egwAction is a circular structure and can't be stringified so just take what we want
+					// Hopefully that's enough for the action handlers
+					for(var k in selected)
+					{
+						if(selected[k].id) clipboard.selected.push({id:selected[k].id, data:selected[k].data});
+					}
+
+					// Save it in session
+					egw.setSessionItem('phpgwapi', 'egw_clipboard', JSON.stringify(clipboard));
+				},true);
+				add_action.group = 1.5;
+
+			}
 			if(typeof _links[copy_action.id] == 'undefined')
 			{
 				_links[copy_action.id] = {
@@ -642,6 +676,15 @@ function egwPopupActionImplementation()
 					"cnt": 0
 				};
 			}
+			if(typeof _links[add_action.id] == 'undefined')
+			{
+				_links[add_action.id] = {
+					"actionObj": add_action,
+					"enabled": true,
+					"visible": true,
+					"cnt": 0
+				};
+			}
 		}
 
 		// Create default paste menu item

From 123bb043d5e1007a2691c85e6c507b1152f00a41 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 5 Nov 2014 07:34:55 +0000
Subject: [PATCH 39/44] * InfoLog/Tracker: fix missing attachments when
 converting a composed mail to an InfoLog or Tracker entry

---
 infolog/inc/class.infolog_ui.inc.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 12b9e0fba2..711fe132b5 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -2502,7 +2502,7 @@ class infolog_ui
 						// instead of fetching only the attachments attached files (as we did previously)
 						$message = $mailobject->getMessageRawBody($attachment['uid'],$attachment['partID'],($attachment['folder']?$attachment['folder']:$mailbox));
 						$headers = $mailobject->getMessageHeader($attachment['uid'],$attachment['partID'],true,false,($attachment['folder']?$attachment['folder']:$mailbox));
-						$subject = str_replace('$$','__',($headers['SUBJECT']?$headers['SUBJECT']:lang('(no subject)')));
+						$subject = $mailClass::adaptSubjectForImport($headers['SUBJECT']);
 						$attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
 						$tmpfile = fopen($attachment_file,'w');
 						fwrite($tmpfile,$message);
@@ -2528,7 +2528,12 @@ class infolog_ui
 							fwrite($tmpfile,$attachmentData['attachment']);
 							fclose($tmpfile);
 						}
-
+						//make sure we search for our attached file in our configured temp_dir
+						if (isset($attachment['file']) && parse_url($attachment['file'],PHP_URL_SCHEME) != 'vfs' &&
+							file_exists($GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($attachment['file'])))
+						{
+							$attachment['file'] = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($attachment['file']);
+						}
 						$attachments[] = array(
 							'name' => $attachment['name'],
 							'mimeType' => $attachment['type'],
@@ -2545,7 +2550,7 @@ class infolog_ui
 			if ($_rawMailHeader && $_rawMailBody && $GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='add_raw')
 			{
 				$message = ltrim(str_replace("\n","\r\n",$_rawMailHeader)).str_replace("\n","\r\n",$_rawMailBody);
-				$subject = str_replace('$$','__',($_subject?$_subject:lang('(no subject)')));
+				$subject = $mailClass::adaptSubjectForImport($_subject);
 				$attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
 				$tmpfile = fopen($attachment_file,'w');
 				fwrite($tmpfile,$message);
@@ -2597,7 +2602,7 @@ class infolog_ui
 			{
 				$message = $mailobject->getMessageRawBody($uid, $partid,$mailbox);
 				$headers = $mailobject->getMessageHeader($uid, $partid,true,false,$mailbox);
-				$subject = str_replace('$$','__',($headers['SUBJECT']?$headers['SUBJECT']:lang('(no subject)')));
+				$subject = $mailClass::adaptSubjectForImport($headers['SUBJECT']);
 				$attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
 				$tmpfile = fopen($attachment_file,'w');
 				fwrite($tmpfile,$message);

From 026e93a0c40f5197f33dc8a5616d84fbc7d83819 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 5 Nov 2014 13:07:13 +0000
Subject: [PATCH 40/44] use template base url from initial template, to
 continue using webdav, if that was loaded via webdav

---
 etemplate/js/et2_widget_template.js | 3 ++-
 etemplate/js/etemplate2.js          | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_template.js b/etemplate/js/et2_widget_template.js
index 29d02532ab..1e5bc0245e 100644
--- a/etemplate/js/et2_widget_template.js
+++ b/etemplate/js/et2_widget_template.js
@@ -103,7 +103,8 @@ var et2_template = et2_DOMWidget.extend(
 				{
 					// Ask server
 					var splitted = template_name.split('.');
-					var path = this.egw().webserverUrl + "/" + splitted.shift() + "/templates/default/" +
+					// use template base url from initial template, to continue using webdav, if that was loaded via webdav
+					var path = this.getRoot()._inst.template_base_url + splitted.shift() + "/templates/default/" +
 						splitted.join('.')+ ".xet" + (cache_buster ? '?'+cache_buster : '');
 
 					if(splitted.length)
diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index 46bce852d6..c8c2c527a1 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -273,6 +273,8 @@ etemplate2.prototype.download = function(_url)
 etemplate2.prototype.load = function(_name, _url, _data, _callback)
 {
 	this.name = _name;	// store top-level template name to have it available in widgets
+	// store template base url, in case initial template is loaded via webdav, to use that for further loads too
+	this.template_base_url = _url.split(_name.split('.').shift())[0];
 
 	egw().debug("info", "Loaded data", _data);
 	var currentapp = this.app = _data.currentapp || window.egw_appName;

From 93aa6fb83ad71a7a7b72fddfe50156e2f7062d94 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 5 Nov 2014 16:13:26 +0000
Subject: [PATCH 41/44] * Calendar: Add new feature to the calendar app, in
 order to be able to sort calendars in day and week views

---
 calendar/inc/class.calendar_uiviews.inc.php |  85 ++--
 calendar/js/app.js                          | 477 +++++++++++---------
 calendar/templates/default/app.css          |  16 +
 calendar/templates/pixelegg/app.css         |  54 +--
 calendar/templates/pixelegg/app.less        |  37 --
 5 files changed, 350 insertions(+), 319 deletions(-)

diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index b40e202ec5..07c61ec98b 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -136,7 +136,7 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * Constructor
 	 *
-	 * @param array $set_states=null to manualy set / change one of the states, default NULL = use $_REQUEST
+	 * @param array $set_states = null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
 	function __construct($set_states=null)
 	{
@@ -275,7 +275,7 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * Displays the planner view
 	 *
-	 * @param boolean $home=false if true return content suitable for home-page
+	 * @param boolean $home = false if true return content suitable for home-page
 	 */
 	function &planner($home=false)
 	{
@@ -359,7 +359,7 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * Displays a multiple week-view
 	 *
-	 * @param boolean $home=false if true return content suitable for home-page
+	 * @param boolean $home = false if true return content suitable for home-page
 	 */
 	function &weekN($home=false)
 	{
@@ -374,7 +374,7 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * Displays a year view
 	 *
-	 * @param boolean $home=false if true return content suitable for home-page
+	 * @param boolean $home = false if true return content suitable for home-page
 	 */
 	function &year($home=false)
 	{
@@ -605,8 +605,8 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * Displays the monthview or a multiple week-view
 	 *
-	 * @param int $weeks=0 number of weeks to show, if 0 (default) all weeks of one month are shown
-	 * @param boolean $home=false if true return content suitable for home-page
+	 * @param int $weeks = 0 number of weeks to show, if 0 (default) all weeks of one month are shown
+	 * @param boolean $home = false if true return content suitable for home-page
 	 */
 	function &month($weeks=0,$home=false)
 	{
@@ -712,7 +712,7 @@ class calendar_uiviews extends calendar_ui
 	 *
 	 * @param int &$first timestamp 0h of first day of week containing the first of the current month
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current month
-	 * @param int $day=1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
+	 * @param int $day = 1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
 	 */
 	function _week_align_month(&$first,&$last,$day=1)
 	{
@@ -760,7 +760,7 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * Four days view, everythings done by the week-view code ...
 	 *
-	 * @param boolean $home=false if true return content suitable for home-page
+	 * @param boolean $home = false if true return content suitable for home-page
 	 * @return string
 	 */
 	function day4($home=false)
@@ -786,8 +786,8 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * Displays the weekview, with 5 or 7 days
 	 *
-	 * @param int $days=0 number of days to show, if 0 (default) the value from the URL or the prefs is used
-	 * @param boolean $home=false if true return content suitable for home-page
+	 * @param int $days = 0 number of days to show, if 0 (default) the value from the URL or the prefs is used
+	 * @param boolean $home = false if true return content suitable for home-page
 	 */
 	function week($days=0,$home=false)
 	{
@@ -889,6 +889,7 @@ class calendar_uiviews extends calendar_ui
 			$headerCounter = 0;
 			foreach($this->_get_planner_users(false) as $uid => $label)
 			{
+				$content .= '<div data-sortable-id="'.$uid.'">';
 				$search_params['users'] = $uid;
 				$content .= '<b>'.$label."</b>\n";
 				$content .= $this->close_button($uid);
@@ -899,7 +900,9 @@ class calendar_uiviews extends calendar_ui
 				{
 					$content .= $navHeader;
 				}
+				$content .= '</div>';
 			}
+			$content = '<div class="cal_is_sortable">'.$content.'</div>';
 		}
 
 		$content = $navHeader.$content;
@@ -918,7 +921,7 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * Displays the dayview
 	 *
-	 * @param boolean $home=false if true return content suitable for home-page
+	 * @param boolean $home = false if true return content suitable for home-page
 	 */
 	function &day($home=false)
 	{
@@ -1161,7 +1164,7 @@ class calendar_uiviews extends calendar_ui
 	 *
 	 * @param int $start time in minutes
 	 * @param int $end time in minutes
-	 * @param int $minimum=0 minimum height
+	 * @param int $minimum = 0 minimum height
 	 * @return float height in percent
 	 */
 	function times2height($start,$end,$minimum=0)
@@ -1180,12 +1183,12 @@ class calendar_uiviews extends calendar_ui
 	 * Uses the dayColWidget to display each day.
 	 *
 	 * @param $daysEvents array with subarrays of events for each day to show, day as YYYYMMDD as key
-	 * @param int $granularity_m=30 granularity in minutes of the rows
-	 * @param int $height=400 height of the widget
-	 * @param string $indent='' string for correct indention
-	 * @param string $title='' title of the time-grid
-	 * @param int/array $owner=0 owner of the calendar (default 0 = $this->owner) or array with owner for each column
-	 * @param boolean $last=true last timeGrid displayed, default true
+	 * @param int $granularity_m = 30 granularity in minutes of the rows
+	 * @param int $height = 400 height of the widget
+	 * @param string $indent = '' string for correct indention
+	 * @param string $title = '' title of the time-grid
+	 * @param int/array $owner = 0 owner of the calendar (default 0 = $this->owner) or array with owner for each column
+	 * @param boolean $last = true last timeGrid displayed, default true
 	 */
 	function &timeGridWidget($daysEvents,$granularity_m=30,$height=400,$indent='',$title='',$owner=0,$last=true)
 	{
@@ -1380,16 +1383,16 @@ class calendar_uiviews extends calendar_ui
 	 * @param int $pleft start of the widget
 	 * @param int $pwidth width of the widget
 	 * @param string $indent string for correct indention
-	 * @param boolean/string $short_title=True should we add a label (weekday, day) with link to the day-view above each day or string with title
-	 * @param boolean $on_off=false start with row_on or row_off, default false=row_off
-	 * @param int $owner=0 if != 0 owner to add to the add-event link
+	 * @param boolean/string $short_title = True should we add a label (weekday, day) with link to the day-view above each day or string with title
+	 * @param boolean $on_off = false start with row_on or row_off, default false=row_off
+	 * @param int $owner = 0 if != 0 owner to add to the add-event link
 	 */
 	function dayColWidget($day_ymd,$events,$pleft,$pwidth,$indent,$short_title=True,$on_off=False,$owner=0)
 	{
 		if ($this->debug > 1 || $this->debug==='dayColWidget') $this->bo->debug_message('uiviews::dayColWidget(%1,%2,left=%3,width=%4,)',False,$day_ymd,$events,$pleft,$pwidth);
 
-		$html = $indent.'<div id="calColumn'.$this->calColumnCounter++.'" class="calendar_calDayCol" style="left: '.$pleft.
-			'%; width: '.$pwidth.'%;">'."\n";
+		$html = $indent.'<div id="calColumn'.$this->calColumnCounter++.'" class="calendar_calDayCol" '.'data-sortable-id="'.$owner.'" style="left: '.$pleft.
+			'%;width: '.$pwidth.'%;">'."\n";
 
 		// Creation of the header-column with date, evtl. holiday-names and a matching background-color
 		$ts = $this->bo->date2ts((string)$day_ymd);
@@ -1517,8 +1520,8 @@ class calendar_uiviews extends calendar_ui
 	 * @param string $day_ymd date
 	 * @param string &$class class to use
 	 * @param string &$holidays commaseparted holidays or empty if none
-	 * @param boolean $only_weekend=false show only the weekend in header-color, otherwise every second days is shown too
-	 * @param boolean $show_bdays=true If available, also show birthdays (or hide Bdays)
+	 * @param boolean $only_weekend = false show only the weekend in header-color, otherwise every second days is shown too
+	 * @param boolean $show_bdays = true If available, also show birthdays (or hide Bdays)
 	 *        Note that this is not the place to disable a preference.
 	 *        If the preferences allow birthdays to be displayed, they are cached within the holidays structure.
 	 *        This setting just suppressing the available data in the view.
@@ -1623,8 +1626,8 @@ class calendar_uiviews extends calendar_ui
 	 * @param $width int width of the widget
 	 * @param string $indent string for correct indention
 	 * @param int $owner owner of the calendar the event is in
-	 * @param boolean $return_array=false should an array with keys(tooltip,popup,html) be returned or the complete widget as string
-	 * @param string $block='event_widget' template used the render the widget
+	 * @param boolean $return_array = false should an array with keys(tooltip,popup,html) be returned or the complete widget as string
+	 * @param string $block = 'event_widget' template used the render the widget
 	 * @param int $z_index is the z-index of the drag-drobable outer box of the event.
 	 * @return string/array
 	 */
@@ -2080,7 +2083,7 @@ class calendar_uiviews extends calendar_ui
 	 * @param mixed $start start-time of the grid
 	 * @param mixed $end end-time of the grid
 	 * @param string|int $by_cat rows by sub-categories of $by_cat (cat_id or 0 for upmost level) or by 'user' or 'month'
-	 * @param string $indent='' string for correct indention
+	 * @param string $indent = '' string for correct indention
 	 * @return string with widget
 	 */
 	function &plannerWidget(&$events,$start,$end,$by_cat=0,$indent='')
@@ -2253,7 +2256,7 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * get all users to display in the planner_by_user
 	 *
-	 * @param boolean $enum_groups=true should groups be returned as there members (eg. planner) or not (day & week)
+	 * @param boolean $enum_groups = true should groups be returned as there members (eg. planner) or not (day & week)
 	 * @return array with uid => label pairs, first all users alphabetically sorted, then all resources
 	 */
 	function _get_planner_users($enum_groups=true)
@@ -2281,9 +2284,13 @@ class calendar_uiviews extends calendar_ui
 				$users[$user] = $this->bo->participant_name($user);
 			}
 		}
-		asort($users);
-		asort($resources);
-
+		// Only sort users in planner views
+		if ($enum_groups)
+		{
+			asort($users);
+			asort($resources);
+		}
+		
 		return $users+$resources;
 	}
 
@@ -2340,7 +2347,7 @@ class calendar_uiviews extends calendar_ui
 	 *
 	 * @param int $start start-time (12h) of the scale
 	 * @param int $days number of days to display
-	 * @param string $indent='' string for correct indention
+	 * @param string $indent = '' string for correct indention
 	 * @return string with scale
 	 */
 	function plannerMonthScale($start,$days,$indent)
@@ -2430,7 +2437,7 @@ class calendar_uiviews extends calendar_ui
 	 *
 	 * @param int $start start-time (12h) of the scale
 	 * @param int $days number of days to display
-	 * @param string $indent='' string for correct indention
+	 * @param string $indent = '' string for correct indention
 	 * @return string with scale
 	 */
 	function plannerWeekScale($start,$days,$indent)
@@ -2475,7 +2482,7 @@ class calendar_uiviews extends calendar_ui
 	 *
 	 * @param int $start start-time (12h) of the scale
 	 * @param int $days number of days to display
-	 * @param string $indent='' string for correct indention
+	 * @param string $indent = '' string for correct indention
 	 * @return string with scale
 	 */
 	function plannerDayScale($start,$days,$indent)
@@ -2599,7 +2606,7 @@ class calendar_uiviews extends calendar_ui
 	 *
 	 * @param int $start start-time (12h) of the scale
 	 * @param int $days number of days to display
-	 * @param string $indent='' string for correct indention
+	 * @param string $indent = '' string for correct indention
 	 * @return string with scale
 	 */
 	function plannerHourScale($start,$days,$indent)
@@ -2644,7 +2651,7 @@ class calendar_uiviews extends calendar_ui
 	 * @param int $end end-time of the row
 	 * @param string $header user or category name for the row-header
 	 * @param string $class additional css class for the row
-	 * @param string $indent='' string for correct indention
+	 * @param string $indent = '' string for correct indention
 	 * @return string with widget
 	 */
 	function plannerRowWidget($events,$start,$end,$header,$class,$indent='')
@@ -2701,7 +2708,7 @@ class calendar_uiviews extends calendar_ui
 	 *
 	 * @param int $start timestamp of start of row
 	 * @param int $days number of days in month of row
-	 * @param string $indent=''
+	 * @param string $indent = ''
 	 * @return string
 	 */
 	function yearlyPlannerMarkDays($start,$days,$indent='')
@@ -2731,7 +2738,7 @@ class calendar_uiviews extends calendar_ui
 	 * @param array $events non-overlapping events to show
 	 * @param int $start start-time of the row
 	 * @param int $end end-time of the row
-	 * @param string $indent='' string for correct indention
+	 * @param string $indent = '' string for correct indention
 	 * @return string with widget
 	 */
 	function eventRowWidget($events,$start,$end,$indent='')
diff --git a/calendar/js/app.js b/calendar/js/app.js
index 5a9f81e32e..914ea2d76d 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -225,209 +225,209 @@ app.classes.calendar = AppJS.extend(
 		var that = this;
 
 		//Draggable & Resizable selector
-		jQuery("div[id^='drag_']")
-			//draggable event handler
-			.draggable
-			({
-				stack: jQuery("div[id^='drag_']"),
-				revert: "invalid",
-				delay: 50,
+		var $drag = jQuery("div[id^='drag_']")
+					//draggable event handler
+					.draggable
+					({
+						stack: jQuery("div[id^='drag_']"),
+						revert: "invalid",
+						delay: 50,
 
-				cursorAt:{top:0,left:0},
-				containment: ".egw_fw_content_browser_iframe",
-				scroll: true,
-				opacity: .6,
-				cursor: "move",
+						cursorAt:{top:0,left:0},
+						containment: ".egw_fw_content_browser_iframe",
+						scroll: true,
+						opacity: .6,
+						cursor: "move",
 
-				/**
-				 * Triggered when the dragging of calEvent stoped.
-				 *
-				 * @param {event} event
-				 * @param {Object} ui
-				 */
-				stop: function(event, ui)
-					{
-					ui.helper.width(oldWidth);
-					ui.helper[0].innerHTML = oldInnerHTML;
-				},
+						/**
+						 * Triggered when the dragging of calEvent stoped.
+						 *
+						 * @param {event} event
+						 * @param {Object} ui
+						 */
+						stop: function(event, ui)
+							{
+							ui.helper.width(oldWidth);
+							ui.helper[0].innerHTML = oldInnerHTML;
+						},
 
-				/**
-				 * Triggered while dragging a calEvent.
-				 *
-				 * @param {event} event
-				 * @param {Object} ui
-				 *
-				 */
-				drag:function(event, ui)
-				{
-					//that.dragEvent();
-				},
-
-				/**
-				 * Triggered when the dragging of calEvent started.
-				 *
-				 * @param {event} event
-				 * @param {Object} ui
-				 *
-				 */
-				start: function(event, ui)
-				{
-					oldInnerHTML = ui.helper[0].innerHTML;
-					oldWidth = ui.helper.width();
-					ui.helper.width(jQuery("#calColumn").width());
-				}
-			})
-
-			//Resizable event handler
-			.resizable
-			({
-				distance: 10,
-
-
-				/**
-				 *  Triggered when the resizable is created.
-				 *
-				 * @param {event} event
-				 * @param {Object} ui
-				 */
-				create:function(event, ui)
-				{
-					var resizeHelper = event.target.getAttribute('data-resize').split("|")[3];
-					if (resizeHelper == 'WD' || resizeHelper == 'WDS')
-					{
-						$j(this).resizable('destroy');
-					}
-				},
-
-				/**
-				 * Triggered at start of resizing a calEvent
-				 *
-				 * @param {event} event
-				 * @param {Object} ui
-				 */
-				start:function(event, ui)
-				{
-					var resizeHelper = event.target.getAttribute('data-resize');
-					var dataResize = resizeHelper.split("|");
-					var time = dataResize[1].split(":");
-
-					this.dropStart = that.resizeHelper(ui.element[0].getBoundingClientRect().left,ui.element[0].getBoundingClientRect().top);
-					this.dropDate = dataResize[0]+"T"+time[0]+time[1];
-					//$j(this).resizable("option","containment",".calendar_calDayCol");
-				},
-
-				/**
-				 * Triggered at the end of resizing the calEvent.
-				 *
-				 * @param {event} event
-				 * @param {Object} ui
-				 */
-				stop:function(event, ui)
-				{
-					var eventFlag = event.target.getAttribute('data-resize').split("|")[3];
-					var dropdate = that.cal_dnd_tZone_converter(this.dropDate);
-					var sT = parseInt((dropdate.split("T")[1].substr(0,2)* 60)) + parseInt(dropdate.split("T")[1].substr(2,2));
-					if (this.dropEnd != 'undefined' && this.dropEnd)
-					{
-						var eT = parseInt(this.dropEnd.getAttribute('data-date').split("|")[1] * 60) + parseInt(this.dropEnd.getAttribute('data-date').split("|")[2]);
-					 	var newDuration = ((eT - sT)/60) * 3600;
-						that.dropEvent(this.getAttribute('id'),dropdate,newDuration,eventFlag);
-					}
-				},
-
-				/**
-				 * Triggered during the resize, on the drag of the resize handler
-				 *
-				 * @param {event} event
-				 * @param {Object} ui
-				 */
-				resize:function(event, ui)
-				{
-					this.dropEnd = that.resizeHelper(ui.element[0].getBoundingClientRect().left,
-													ui.element[0].getBoundingClientRect().top+ui.size.height);
-
-					if (typeof this.dropEnd != 'undefined' && this.dropEnd)
-					{
-						if (this.dropEnd.getAttribute('id').match(/drop_/g))
+						/**
+						 * Triggered while dragging a calEvent.
+						 *
+						 * @param {event} event
+						 * @param {Object} ui
+						 *
+						 */
+						drag:function(event, ui)
 						{
-							var dH = this.dropEnd.getAttribute('data-date').split("|")[1];
-							var dM = this.dropEnd.getAttribute('data-date').split("|")[2];
+							//that.dragEvent();
+						},
+
+						/**
+						 * Triggered when the dragging of calEvent started.
+						 *
+						 * @param {event} event
+						 * @param {Object} ui
+						 *
+						 */
+						start: function(event, ui)
+						{
+							oldInnerHTML = ui.helper[0].innerHTML;
+							oldWidth = ui.helper.width();
+							ui.helper.width(jQuery("#calColumn").width());
 						}
-						var dataResize = event.target.getAttribute('data-resize').split("|");
-						this.innerHTML = '<div style="font-size: 1.1em; text-align:center; font-weight: bold; height:100%;"><span class="calendar_timeDemo" >'+dH+':'+dM+'</span></div>';
-					}
-					else
-					{
-						this.innerHTML = '<div class="calendar_d-n-d_forbiden"></div>';
-					}
-				}
-			});
+					})
+
+					//Resizable event handler
+					.resizable
+					({
+						distance: 10,
+
+
+						/**
+						 *  Triggered when the resizable is created.
+						 *
+						 * @param {event} event
+						 * @param {Object} ui
+						 */
+						create:function(event, ui)
+						{
+							var resizeHelper = event.target.getAttribute('data-resize').split("|")[3];
+							if (resizeHelper == 'WD' || resizeHelper == 'WDS')
+							{
+								jQuery(this).resizable('destroy');
+							}
+						},
+
+						/**
+						 * Triggered at start of resizing a calEvent
+						 *
+						 * @param {event} event
+						 * @param {Object} ui
+						 */
+						start:function(event, ui)
+						{
+							var resizeHelper = event.target.getAttribute('data-resize');
+							var dataResize = resizeHelper.split("|");
+							var time = dataResize[1].split(":");
+
+							this.dropStart = that.resizeHelper(ui.element[0].getBoundingClientRect().left,ui.element[0].getBoundingClientRect().top);
+							this.dropDate = dataResize[0]+"T"+time[0]+time[1];
+							//$j(this).resizable("option","containment",".calendar_calDayCol");
+						},
+
+						/**
+						 * Triggered at the end of resizing the calEvent.
+						 *
+						 * @param {event} event
+						 * @param {Object} ui
+						 */
+						stop:function(event, ui)
+						{
+							var eventFlag = event.target.getAttribute('data-resize').split("|")[3];
+							var dropdate = that.cal_dnd_tZone_converter(this.dropDate);
+							var sT = parseInt((dropdate.split("T")[1].substr(0,2)* 60)) + parseInt(dropdate.split("T")[1].substr(2,2));
+							if (this.dropEnd != 'undefined' && this.dropEnd)
+							{
+								var eT = parseInt(this.dropEnd.getAttribute('data-date').split("|")[1] * 60) + parseInt(this.dropEnd.getAttribute('data-date').split("|")[2]);
+								var newDuration = ((eT - sT)/60) * 3600;
+								that.dropEvent(this.getAttribute('id'),dropdate,newDuration,eventFlag);
+							}
+						},
+
+						/**
+						 * Triggered during the resize, on the drag of the resize handler
+						 *
+						 * @param {event} event
+						 * @param {Object} ui
+						 */
+						resize:function(event, ui)
+						{
+							this.dropEnd = that.resizeHelper(ui.element[0].getBoundingClientRect().left,
+															ui.element[0].getBoundingClientRect().top+ui.size.height);
+
+							if (typeof this.dropEnd != 'undefined' && this.dropEnd)
+							{
+								if (this.dropEnd.getAttribute('id').match(/drop_/g))
+								{
+									var dH = this.dropEnd.getAttribute('data-date').split("|")[1];
+									var dM = this.dropEnd.getAttribute('data-date').split("|")[2];
+								}
+								var dataResize = event.target.getAttribute('data-resize').split("|");
+								this.innerHTML = '<div style="font-size: 1.1em; text-align:center; font-weight: bold; height:100%;"><span class="calendar_timeDemo" >'+dH+':'+dM+'</span></div>';
+							}
+							else
+							{
+								this.innerHTML = '<div class="calendar_d-n-d_forbiden"></div>';
+							}
+						}
+					});
 
 		//Droppable selector
-		jQuery("div[id^='drop_']")
-			//Droppable event handler
-			.droppable
-			({
-				/**
-				 * Make all draggable calEvents acceptable
-				 *
-				 */
-				accept:function()
-				{
-					return true;
-				},
-				tolerance:'pointer',
+		var $drop = jQuery("div[id^='drop_']")
+					//Droppable event handler
+					.droppable
+					({
+						/**
+						 * Make all draggable calEvents acceptable
+						 *
+						 */
+						accept:function()
+						{
+							return true;
+						},
+						tolerance:'pointer',
 
-				/**
-				 * Triggered when the calEvent dropped.
-				 *
-				 * @param {event} event
-				 * @param {Object} ui
-				 */
-				drop:function(event, ui)
-				{
-					var dgId = ui.draggable[0].getAttribute('id');
-					var dgOwner = dgId.substring(dgId.lastIndexOf("_C")+2,dgId.lastIndexOf(""));
-					var dpOwner = event.target.getAttribute('data-owner');
-					var eventFlag = ui.draggable[0].getAttribute('data-resize').split("|")[3];
-					if (dpOwner == null) dpOwner = dgOwner;
-					if (dpOwner == dgOwner )
-					{
-						that.dropEvent(ui.draggable[0].id, event.target.getAttribute('id').substring(event.target.getAttribute('id').lastIndexOf("drop_")+5, event.target.getAttribute('id').lastIndexOf("_O")),null,eventFlag);
-					}
-					else
-					{
-						jQuery(ui.draggable).draggable("option","revert",true);
-					}
+						/**
+						 * Triggered when the calEvent dropped.
+						 *
+						 * @param {event} event
+						 * @param {Object} ui
+						 */
+						drop:function(event, ui)
+						{
+							var dgId = ui.draggable[0].getAttribute('id');
+							var dgOwner = dgId.substring(dgId.lastIndexOf("_C")+2,dgId.lastIndexOf(""));
+							var dpOwner = event.target.getAttribute('data-owner');
+							var eventFlag = ui.draggable[0].getAttribute('data-resize').split("|")[3];
+							if (dpOwner == null) dpOwner = dgOwner;
+							if (dpOwner == dgOwner )
+							{
+								that.dropEvent(ui.draggable[0].id, event.target.getAttribute('id').substring(event.target.getAttribute('id').lastIndexOf("drop_")+5, event.target.getAttribute('id').lastIndexOf("_O")),null,eventFlag);
+							}
+							else
+							{
+								jQuery(ui.draggable).draggable("option","revert",true);
+							}
 
-				},
+						},
 
-				/**
-				 * Triggered when draggable calEvent is over a droppable calCell.
-				 *
-				 * @param {event} event
-				 * @param {Object} ui
-				 */
-				over:function(event, ui)
-				{
-					var timeDemo = event.target.id.substring(event.target.id.lastIndexOf("T")+1,event.target.id.lastIndexOf("_O"));
-					var dgId = ui.draggable[0].getAttribute('id');
-					var dgOwner = dgId.substring(dgId.lastIndexOf("_C")+2,dgId.lastIndexOf(""));
-					var dpOwner = event.target.getAttribute('data-owner');
-					if (dpOwner == null) dpOwner = dgOwner;
-					if (dpOwner === dgOwner )
-					{
-						ui.helper[0].innerHTML = '<div class="calendar_d-n-d_timeCounter"><span>'+timeDemo+'</span></div>';
-					}
-					else
-					{
-						ui.helper[0].innerHTML = '<div class="calendar_d-n-d_forbiden"></div>';
-					}
-				}
-			});
+						/**
+						 * Triggered when draggable calEvent is over a droppable calCell.
+						 *
+						 * @param {event} event
+						 * @param {Object} ui
+						 */
+						over:function(event, ui)
+						{
+							var timeDemo = event.target.id.substring(event.target.id.lastIndexOf("T")+1,event.target.id.lastIndexOf("_O"));
+							var dgId = ui.draggable[0].getAttribute('id');
+							var dgOwner = dgId.substring(dgId.lastIndexOf("_C")+2,dgId.lastIndexOf(""));
+							var dpOwner = event.target.getAttribute('data-owner');
+							if (dpOwner == null) dpOwner = dgOwner;
+							if (dpOwner === dgOwner )
+							{
+								ui.helper[0].innerHTML = '<div class="calendar_d-n-d_timeCounter"><span>'+timeDemo+'</span></div>';
+							}
+							else
+							{
+								ui.helper[0].innerHTML = '<div class="calendar_d-n-d_forbiden"></div>';
+							}
+						}
+					});
 
 		//jQuery Calendar Event selector
-		jQuery("body")
+		var $iframeBody = jQuery("body")
 			//mouseover event handler for calendar tooltip
 			.on("mouseover", "div[data-tooltip]",function(){
 				var $ttp = jQuery(this);
@@ -530,16 +530,15 @@ app.classes.calendar = AppJS.extend(
 					}
 				}
 
-				var eventInfo =
-					{
-						date: timestamp[0],
-						hour: timestamp[1],
-						minute: timestamp[2]
-					};
+				var eventInfo = {
+					date: timestamp[0],
+					hour: timestamp[1],
+					minute: timestamp[2]
+				};
 
 				if (typeof ownerId !='undefined' && ownerId != 0)
 				{
-					$j(eventInfo).extend(eventInfo,{owner: ownerId});
+					jQuery(eventInfo).extend(eventInfo,{owner: ownerId});
 				}
 
 				that.egw.open(null, 'calendar', 'add', eventInfo , '_blank');
@@ -552,6 +551,74 @@ app.classes.calendar = AppJS.extend(
 					that.egw.open_link(link,'_blank',windowSize);
 					return false;
 			});
+			
+		//******************************** Calendar Sortable ************************
+		// Calender current state
+		var state = this.getState();
+		
+		if (state && state.view === "day"
+				&& typeof state.owner != 'undefined'
+				&& state.owner.split(',').length > 1)
+		{
+			$iframeBody.find('#calendar_calDayCols')
+					.addClass('cal_is_sortable')
+					.css({"white-space":"nowrap"})
+					.children().each(function(){
+						// Change day view columns position in order to get sortable placeholder working
+						jQuery(this).css({position:"relative",display:"inline-block", left:"none"});
+			});
+		}
+			
+		$iframeBody.find('.cal_is_sortable').sortable ({
+				cancel: "#divAppboxHeader, .calendar_calWeekNavHeader, .calendar_plannerHeader",
+				placeholder: "srotable_cal_wk_ph",
+				axis:"y",
+				revert: true,
+				helper:"clone",
+				create: function ()
+				{
+					var $sortItem = jQuery(this);
+					var options = {};
+					switch (state.view)
+					{
+						case "day":
+							options = {
+								placeholder:"srotable_cal_day_ph",
+								axis:"x"
+							};
+							$sortItem.sortable('option', options);
+							break;
+						case "week":
+							options = {
+								placeholder:"srotable_cal_wk_ph",
+								axis:"y"
+							};
+							$sortItem.sortable('option', options);
+							break;
+						default:
+							$sortItem.sortable('destroy');
+					}
+				},
+				start: function ()
+				{
+					$drag.draggable('disable');
+					$drop.droppable('disable');
+				},
+				stop: function ()
+				{
+					$drag.draggable('enable');
+					$drop.droppable('enable');
+				},
+				update: function ()
+				{
+					if (state && typeof state.owner !== 'undefined')
+					{
+						var sortedArr = jQuery(this).sortable('toArray', {attribute:"data-sortable-id"});
+						state.owner = sortedArr.join(',');
+						that.setState({state:state});
+					}
+				}
+			});
 	},
 
 	/**
@@ -564,16 +631,16 @@ app.classes.calendar = AppJS.extend(
 	 */
 	resizeHelper: function(_X,_Y)
 	{
-		var drops = jQuery("div[id^='drop_']");
+		var $drops = jQuery("div[id^='drop_']");
 		var top = Math.round(_Y);
 		var left = Math.round(_X);
-		for (var i=0;i < drops.length;i++)
+		for (var i=0;i < $drops.length;i++)
 		{
-			if (top >= Math.round(drops[i].getBoundingClientRect().top)
-					&& top <= Math.round(drops[i].getBoundingClientRect().bottom)
-					&& left >= Math.round(drops[i].getBoundingClientRect().left)
-					&& left <= Math.round(drops[i].getBoundingClientRect().right))
-				return drops[i];
+			if (top >= Math.round($drops[i].getBoundingClientRect().top)
+					&& top <= Math.round($drops[i].getBoundingClientRect().bottom)
+					&& left >= Math.round($drops[i].getBoundingClientRect().left)
+					&& left <= Math.round($drops[i].getBoundingClientRect().right))
+				return $drops[i];
 		}
 		return false;
 	},
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 91bfc26327..f11463e51b 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -649,4 +649,20 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 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;
 }
\ No newline at end of file
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 7e5b467e45..75afc82e7b 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
  * @package calendar
  * @version $Id$
  */
-/* $Id: app.css 48463 2014-09-04 13:37:46Z ralfbecker $ */
+/* $Id: app.css 49287 2014-11-04 15:34:51Z hnategh $ */
 /*Media print classes*/
 @media print {
   .th td,
@@ -660,6 +660,21 @@ 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;
+}
 /*generell*/
 .egw_fw_content_browser_iframe img[src$="svg"] {
   background-color: #828282 !important;
@@ -1386,40 +1401,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   font-size: 8pt;
   text-align: left;
 }
-/* contains (multiple) dayCol's
- */
-.calendar_calDayCols,
-.calendar_calDayCols12h,
-.calendar_calDayColsNoGrid {
-  position: absolute;
-  top: 0px;
-  /*	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;
-}
 /* Calendar Id #
 */
 #calendar-edit_id:before {
@@ -1452,9 +1433,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calGridHeader {
   border: none;
 }
-.calendar_calDayColHeader img {
-  vertical-align: middle;
-}
 /*header for the weekCol*/
 .calendar_calWeekNavHeader,
 .calendar_calMonthNavHeader {
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 676f0967a8..6ca86eb698 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -848,39 +848,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
     text-align: left;
 }
 
-/* contains (multiple) dayCol's
- */
-.calendar_calDayCols,.calendar_calDayCols12h,.calendar_calDayColsNoGrid{
-    position: absolute;
-    top: 0px;
-    /*	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;
-}
 /* Calendar Id #
 */
 #calendar-edit_id:before { content:"#"}
@@ -915,10 +882,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calGridHeader{ border: none; }
 
 
-.calendar_calDayColHeader img {
-    vertical-align: middle;
-}
-
  /*header for the weekCol*/
 
 .calendar_calWeekNavHeader,.calendar_calMonthNavHeader{

From a37c884969f49f6efeb4a93cfdc2215e2d6b5aa3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 5 Nov 2014 16:51:55 +0000
Subject: [PATCH 42/44] * Mail: fixed icons for special use folders did not use
 folders set in mail account

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

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 6501ecbb5d..1e52de6207 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -767,15 +767,14 @@ class mail_ui
 			$folderObjects = $this->mail_bo->getFolderObjects($_subscribedOnly,false,false,$_useCacheIfPossible);
 			//$endtime = microtime(true) - $starttime;
 			//error_log(__METHOD__.__LINE__.' Fetching folderObjects took: '.$endtime);
-			$trashFolder = $this->mail_bo->getTrashFolder(false);
-			$templateFolder = $this->mail_bo->getTemplateFolder(false);
-			$draftFolder = $this->mail_bo->getDraftFolder(false);
-			$sentFolder = $this->mail_bo->getSentFolder(false);
-			$userDefinedFunctionFolders = array();
-			if (isset($trashFolder) && $trashFolder != 'none') $userDefinedFunctionFolders['Trash'] = $trashFolder;
-			if (isset($sentFolder) && $sentFolder != 'none') $userDefinedFunctionFolders['Sent'] = $sentFolder;
-			if (isset($draftFolder) && $draftFolder != 'none') $userDefinedFunctionFolders['Drafts'] = $draftFolder;
-			if (isset($templateFolder) && $templateFolder != 'none') $userDefinedFunctionFolders['Templates'] = $templateFolder;
+			$userDefinedFunctionFolders = array(
+				'Trash'     => $this->mail_bo->getTrashFolder(false),
+				'Templates' => $this->mail_bo->getTemplateFolder(false),
+				'Drafts'    => $this->mail_bo->getDraftFolder(false),
+				'Sent'      => $this->mail_bo->getSentFolder(false),
+				'Junk'      => $this->mail_bo->getJunkFolder(false),
+				'Outbox'    => $this->mail_bo->getOutboxFolder(false),
+			);
 		}
 		catch (Exception $e)
 		{
@@ -863,7 +862,7 @@ class mail_ui
 			// the rest of the array is the name of the parent
 			$parentName = implode((array)$folderParts,$obj->delimiter);
 			$parentName = $this->mail_bo->profileID.self::$delimiter.$parentName;
-			$oA =array('text'=> $obj->shortDisplayName, 'tooltip'=> $obj->displayName);
+			$oA =array('text'=> $obj->shortDisplayName, 'tooltip'=> $obj->folderName);
 			array_unshift($fFP,$this->mail_bo->profileID);
 			$oA['path'] = $fFP;
 			$path = $key;
@@ -873,15 +872,10 @@ class mail_ui
 				// mark on inbox if ACL is supported
 				$oA['data'] = array('acl' => $this->mail_bo->icServer->queryCapability('ACL'));
 			}
-			elseif (in_array($obj->shortFolderName,mail_bo::$autoFolders))
+			elseif (($_key = array_search($obj->folderName, $userDefinedFunctionFolders)) !== false)
 			{
-				$oA['text'] = lang($oA['text']);
+				$oA['text'] = lang($_key);
 
-				$oA['im0'] = $oA['im1']= $oA['im2'] = "MailFolder".$obj->shortFolderName.".png";
-			}
-			elseif (in_array($key,$userDefinedFunctionFolders))
-			{
-				$_key = array_search($key,$userDefinedFunctionFolders);
 				$oA['im0'] = $oA['im1']= $oA['im2'] = "MailFolder".$_key.".png";
 			}
 			else

From 244046528aa220a3c5d3ca91bee1979965443d26 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 5 Nov 2014 17:24:34 +0000
Subject: [PATCH 43/44] setting univentionMailHomeServer attribute to trigger
 directory listener to create INBOX and create configured folders in mail app

---
 doc/rpm-build/post_install.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php
index c900511349..6872b81a41 100755
--- a/doc/rpm-build/post_install.php
+++ b/doc/rpm-build/post_install.php
@@ -772,17 +772,19 @@ function set_univention_defaults()
 		$config['sambaadmin/sambaSID'] = exec('/usr/bin/univention-ldapsearch -x "(objectclass=sambadomain)" sambaSID|sed -n "s/sambaSID: \(.*\)/\1/p"');
 
 		// mailserver, see setup-cli.php --help config
-		if (_ucr_get('mail/cyrus/imap') == 'yes' && ($domains=_ucr_get('mail/hosteddomains')))
+		if (($mailserver = exec('/usr/bin/univention-ldapsearch -x "(univentionAppID=mailserver_*)" univentionAppInstalledOnServer|sed -n "s/univentionAppInstalledOnServer: \(.*\)/\1/p"')) &&
+			_ucr_get('mail/cyrus/imap') == 'yes' && ($domains=_ucr_get('mail/hosteddomains')))
 		{
 			if (!is_array($domains)) $domains = explode("\n", $domains);
 			$domain = array_shift($domains);
-			$config['smtpserver'] = 'localhost,465,,,yes,tls';
+			$config['smtpserver'] = "$mailserver,465,,,yes,tls";
 			$config['smtp'] = 'no,emailadmin_smtp_ldap_univention';
-			$config['mailserver'] = "localhost,993,$domain,email,tls";
-			$config['imap'] = 'root,'._ucr_secret('cyrus').',emailadmin_imap_cyrus';
+			$config['mailserver'] = "$mailserver,993,$domain,email,tls";
+			$config['imap'] = /*'cyrus,'._ucr_secret('cyrus')*/','.',emailadmin_imap_cyrus';
+			$config['folder'] = 'INBOX/Sent,INBOX/Trash,INBOX/Drafts,INBOX/Templates,INBOX/Spam';
 			if (($sieve_port = _ucr_get('mail/cyrus/sieve/port')))
 			{
-				$config['sieve'] = 'localhost,'.$sieve_port.',starttls';
+				$config['sieve'] = "$mailserver,$sieve_port,starttls";
 			}
 		}
 	}

From 753ce75b151c2d2fd5f3e0911e805550c858f218 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 5 Nov 2014 20:27:52 +0000
Subject: [PATCH 44/44] using univention-directory-manager cli to create not
 accounts to get Kerberos stuff addded

---
 doc/rpm-build/post_install.php                |  2 +-
 .../inc/class.accounts_univention.inc.php     | 82 +++++++++++++++++++
 setup/inc/class.setup_cmd_config.inc.php      | 49 ++++++++++-
 setup/inc/hook_config.inc.php                 | 11 +++
 setup/templates/default/config.tpl            |  4 +-
 5 files changed, 140 insertions(+), 8 deletions(-)
 create mode 100644 phpgwapi/inc/class.accounts_univention.inc.php

diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php
index 6872b81a41..739e52083b 100755
--- a/doc/rpm-build/post_install.php
+++ b/doc/rpm-build/post_install.php
@@ -766,7 +766,7 @@ function set_univention_defaults()
 
 		$config['account_min_id'] = 1200;	// UCS use 11xx for internal users/groups
 
-		$config['account-auth'] = 'ldap';
+		$config['account-auth'] = 'univention,ldap';
 
 		// set sambaadmin sambaSID
 		$config['sambaadmin/sambaSID'] = exec('/usr/bin/univention-ldapsearch -x "(objectclass=sambadomain)" sambaSID|sed -n "s/sambaSID: \(.*\)/\1/p"');
diff --git a/phpgwapi/inc/class.accounts_univention.inc.php b/phpgwapi/inc/class.accounts_univention.inc.php
new file mode 100644
index 0000000000..bfafc8a426
--- /dev/null
+++ b/phpgwapi/inc/class.accounts_univention.inc.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * API - accounts Univention LDAP backend
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <rb@stylite.de>
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage accounts
+ * @version $Id$
+ */
+
+/**
+ * Univention LDAP Backend for accounts
+ *
+ * This backend is mostly identical to LDAP backend and need to be configured in the same way.
+ * Only difference is that new users get created via univention-directory-manager CLI program,
+ * to generate necesary Kerberos stuff.
+ */
+class accounts_univention extends accounts_ldap
+{
+	/**
+	 * Name of binary to call
+	 */
+	const DIRECTORY_MANAGER_BIN = '/usr/sbin/univention-directory-manager';
+
+	/**
+	 * Saves / adds the data of one account
+	 *
+	 * If no account_id is set in data the account is added and the new id is set in $data.
+	 *
+	 * @param array $data array with account-data
+	 * @return int|boolean the account_id or false on error
+	 */
+	function save(&$data)
+	{
+		if (!$data['account_id'] && $data['account_type'] !== 'g' && self::available())
+		{
+			$params = array(
+				'users/user','create',
+				'--binddn', $this->frontend->config['ldap_root_dn'],
+				'--bindpwd', 5=>$this->frontend->config['ldap_root_pw'],
+				'--position', $this->frontend->config['ldap_context'],
+				'--set', 'username='.$data['account_lid'],
+				'--set', 'firstname='.$data['account_firstname'],
+				'--set', 'lastname='.$data['account_lastname'],
+			);
+			if ($data['account_email'])
+			{
+				$params[] = '--set'; $params[] = 'mailPrimaryAddress='.$data['account_email'];
+			}
+			if (!empty($data['account_passwd']))
+			{
+				$params[] = '--set'; $params[] = 'password='.$data['account_passwd'];
+			}
+			$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
+			$output_arr = $ret = $matches = null;
+			exec($cmd, $output_arr, $ret);
+			$output = explode("\n", $output_arr);
+			if ($ret || !preg_match('/^Object created: (uid=.*)$/mui', $output, $matches))
+			{
+				$params[5] = '********';	// mask out password!
+				$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
+				throw new egw_exception_wrong_userinput($cmd."\nreturned\n".$output);
+			}
+			$data['account_dn'] = $matches[1];
+			$data['account_id'] = $this->name2id($matches[1], 'account_dn', 'u');
+		}
+		return parent::save($data);
+	}
+
+	/**
+	 * Check if our function depending on an external binary is available
+	 *
+	 * @return boolean
+	 */
+	public static function available()
+	{
+		return file_exists(self::DIRECTORY_MANAGER_BIN) && is_executable(self::DIRECTORY_MANAGER_BIN);
+	}
+}
diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php
index 26383250d2..6cfc89d613 100644
--- a/setup/inc/class.setup_cmd_config.inc.php
+++ b/setup/inc/class.setup_cmd_config.inc.php
@@ -82,10 +82,15 @@ class setup_cmd_config extends setup_cmd
 		{
 			if (substr($name, 0, 4) == 'acc_') continue;
 
+			$app = 'phpgwapi';
+			if (strpos($name, '/') !== false)
+			{
+				list($app, $name) = explode('/', $name);
+			}
 			self::$egw_setup->db->insert(self::$egw_setup->config_table,array(
 				'config_value' => $value,
 			),array(
-				'config_app'  => 'phpgwapi',
+				'config_app'  => $app,
 				'config_name' => $name,
 			),__LINE__,__FILE__);
 		}
@@ -194,6 +199,7 @@ class setup_cmd_config extends setup_cmd
 		'--ldap-context' => 'ldap_context',
 		'--ldap-search-filter' => 'ldap_search_filter',
 		'--ldap-group-context' => 'ldap_group_context',
+		'--sambaadmin-sid' => 'sambaadmin/sambaSID',
 		'--allow-remote-admin' => 'allow_remote_admin',
 		'--install-id' => 'install_id',
 		'--ads-host' => 'ads_host',
@@ -397,10 +403,14 @@ class setup_cmd_config extends setup_cmd
 				{
 					if (is_array($data) && isset($data['allowed']))
 					{
-						if ($data['name'] == 'auth_type')
+						switch ($data['name'])
 						{
-							$options[$data['name']] = self::auth_types();
-							continue;
+							case 'auth_type':
+								$options[$data['name']] = self::auth_types();
+								continue 2;
+							case 'account_repository':
+								$options[$data['name']] = self::account_repositries();
+								continue 2;
 						}
 						foreach($data['allowed'] as $label => $value)
 						{
@@ -460,6 +470,37 @@ class setup_cmd_config extends setup_cmd
 		return $auth_types;
 	}
 
+	/**
+	 * Read auth-types (existing auth backends) from filesystem and fix our $options array
+	 *
+	 * @return array
+	 */
+	static function account_repositories()
+	{
+		static $account_repositories = array(
+			'sql' => 'SQL',
+			'ldap' => 'LDAP',
+			'ads'  => 'Active Directory',
+		);
+		static $scan_done = null;
+		if (!$scan_done++)
+		{
+			// now add auth backends found in filesystem
+			foreach(scandir(EGW_INCLUDE_ROOT.'/phpgwapi/inc') as $file)
+			{
+				$matches = null;
+				if (preg_match('/^class\.accounts_([a-z]+)\.inc\.php$/', $file, $matches) &&
+					!isset($account_repositories[$matches[1]]) &&
+					class_exists($class='accounts_'.$matches[1]) &&
+					(!is_callable($callable=$class.'::available') || call_user_func($callable)))
+				{
+					$account_repositories[$matches[1]] = ucfirst($matches[1]);
+				}
+			}
+		}
+		return $account_repositories;
+	}
+
 	/**
 	 * Return the defaults from the $options array
 	 *
diff --git a/setup/inc/hook_config.inc.php b/setup/inc/hook_config.inc.php
index 6bc2912a04..0779a36d69 100644
--- a/setup/inc/hook_config.inc.php
+++ b/setup/inc/hook_config.inc.php
@@ -185,6 +185,17 @@ function auth_type_activesync($config)
 	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_activesync']);
 }
 
+/**
+ * Make account-repository-types from setup_cmd_config available
+ *
+ * @param array $config
+ * @return string
+ */
+function account_repository($config)
+{
+	return _options_from(setup_cmd_config::account_repositories(), $config['account_repository']);
+}
+
 /**
  * Returns options string
  *
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index 389349ce96..65723c6abd 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -173,9 +173,7 @@
     <td>{lang_Select_where_you_want_to_store/retrieve_user_accounts}:</td>
     <td>
      <select name="newsettings[account_repository]">
-      <option value="sql"{selected_account_repository_sql}>SQL</option>
-      <option value="ldap"{selected_account_repository_ldap}>LDAP</option>
-      <option value="ads"{selected_account_repository_ads}>Active Directory</option>
+{hook_account_repository}
      </select>
     </td>
    </tr>