From 6fb84bb8cdcdfe36513448f4b9e019de0073c5ae Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 6 Sep 2010 07:57:10 +0000
Subject: [PATCH 01/47] include 250 in checking the error-codes when sending
 data, as 250 indicates success -> OK (354 indicates intermediate status, and
 was the only status checked for)

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

diff --git a/phpgwapi/inc/class.smtp.php b/phpgwapi/inc/class.smtp.php
index e16df7a9f5..8cefb83e11 100644
--- a/phpgwapi/inc/class.smtp.php
+++ b/phpgwapi/inc/class.smtp.php
@@ -345,7 +345,7 @@ class SMTP {
       error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $rply . $this->CRLF );
     }
 
-    if($code != 354) {
+    if($code != 354 && $code != 250) {
       $this->error =
         array("error" => "DATA command not accepted from server",
               "smtp_code" => $code,

From 488959aa5faac984e36f99ba6d3c337c19b1395f Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 6 Sep 2010 09:29:05 +0000
Subject: [PATCH 02/47] filemanager: JavaScript IE8Compat myStylite Ticket#835
 Send filemanager entry by mail

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

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index f37a2c3810..0796fcf176 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -301,7 +301,7 @@ class filemanager_ui
 	function open_mail(attachments)
 	{
 		var link = '".egw::link('/index.php',array('menuaction' => 'felamimail.uicompose.compose'))."';
-
+		var i = 0;
 		if (!(attachments instanceof Array)) attachments = [ attachments ];
 
 		for(i=0; i < attachments.length; i++)

From 5e47dcd0da0c32389103d0826106690de445c8a1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 6 Sep 2010 14:09:27 +0000
Subject: [PATCH 03/47] calling job with data array, plus all regular job data,
 like eg. next (time job was supposted to run)

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

diff --git a/phpgwapi/inc/class.asyncservice.inc.php b/phpgwapi/inc/class.asyncservice.inc.php
index c2c5cb3ecd..fa6c5045e8 100644
--- a/phpgwapi/inc/class.asyncservice.inc.php
+++ b/phpgwapi/inc/class.asyncservice.inc.php
@@ -426,7 +426,7 @@ class asyncservice
 				list($app) = strpos($job['method'],'::') !== false ? explode('_',$job['method']) :
 					explode('.',$job['method']);
 				translation::add_app($app);
-				ExecMethod($job['method'],$job['data']);
+				ExecMethod($job['method'],$job['data']+array_diff_key($job,array('data' => false)));
 
 				// re-read job, in case it had been updated or even deleted in the method
 				$updated = $this->read($id);

From 78862a1335b41b7991cb1f26ba2910faac7f0ce6 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 6 Sep 2010 15:17:53 +0000
Subject: [PATCH 04/47] idots: fix for IE8 Compatibility; resources select box
 was not shown in calendar sidebox

---
 phpgwapi/templates/idots/css/idots.css       | 1 +
 phpgwapi/templates/idots/css/traditional.css | 1 +
 2 files changed, 2 insertions(+)

diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css
index 31d65446a8..5a12bd04d8 100644
--- a/phpgwapi/templates/idots/css/idots.css
+++ b/phpgwapi/templates/idots/css/idots.css
@@ -29,6 +29,7 @@
 
 .textSidebox {
 	border-top: 1px solid #d3d3d3;
+	padding-left: 2px;
 }
 
 .divSidebox table {
diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index a10399a082..b389473e6b 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -210,6 +210,7 @@ a.textSidebox
 {
 	padding-top:3px;
 	padding-bottom:3px;
+	padding-left: 2px;
 	border-top: solid #aaaaaa 1px;
 	overflow: auto;
 }

From a7e0270be1a0e82444fc57507aa095ea2204e9bc Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 6 Sep 2010 15:50:50 +0000
Subject: [PATCH 05/47] idots: IE8 Compatibility, reduce to 1pxpadding-left;
 resources select box was not shown in calendar sidebox

---
 phpgwapi/templates/idots/css/idots.css       | 2 +-
 phpgwapi/templates/idots/css/traditional.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css
index 5a12bd04d8..6d545abf1d 100644
--- a/phpgwapi/templates/idots/css/idots.css
+++ b/phpgwapi/templates/idots/css/idots.css
@@ -29,7 +29,7 @@
 
 .textSidebox {
 	border-top: 1px solid #d3d3d3;
-	padding-left: 2px;
+	padding-left: 1px;
 }
 
 .divSidebox table {
diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index b389473e6b..3f9049f4c8 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -210,7 +210,7 @@ a.textSidebox
 {
 	padding-top:3px;
 	padding-bottom:3px;
-	padding-left: 2px;
+	padding-left: 1px;
 	border-top: solid #aaaaaa 1px;
 	overflow: auto;
 }

From f978418d79d118f73b5090e80dbf09bf1d00c0f2 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Sep 2010 08:27:25 +0000
Subject: [PATCH 06/47] * fixed private contacts not synced for an owner
 filter, which is NOT the current user, filter out private entries

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

diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 7356122db8..61c22853e9 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -278,7 +278,8 @@ class addressbook_sql extends so_sql_cf
 			{
 				if (!($filter['owner'] = array_intersect((array)$filter['owner'],array_keys($this->grants)))) return false;
 
-				$filter['private'] = 0;
+				// for an owner filter, which is NOT the current user, filter out private entries
+				if ($filter['owner'] != $GLOBALS['egw_info']['user']['account_id']) $filter['private'] = 0;
 			}
 			else	// search all addressbooks, incl. accounts
 			{

From 2777c78d74c4d34ff039801747c41bf4f93cc1c5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Sep 2010 11:05:20 +0000
Subject: [PATCH 07/47] new mount option for filesystem streamwrapper to
 specify a download url, to be used instead of default webdav.php download,
 eg. if mounted directory is already in the docroot or mapped via an alias

---
 phpgwapi/inc/class.egw_vfs.inc.php            |  4 ++
 .../class.filesystem_stream_wrapper.inc.php   | 39 +++++++++++++++++++
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php | 19 +++++++++
 3 files changed, 62 insertions(+)

diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php
index 45c6bfc039..de7b2d5421 100644
--- a/phpgwapi/inc/class.egw_vfs.inc.php
+++ b/phpgwapi/inc/class.egw_vfs.inc.php
@@ -1167,6 +1167,10 @@ class egw_vfs extends vfs_stream_wrapper
 	 */
 	static function download_url($path,$force_download=false)
 	{
+		if (($url = self::_call_on_backend('download_url',array($path,$force_download),true)))
+		{
+			return $url;
+		}
 		if ($path[0] != '/')
 		{
 			$path = parse_url($path,PHP_URL_PATH);
diff --git a/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php b/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
index 2e7c77327b..c01706fa25 100644
--- a/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.filesystem_stream_wrapper.inc.php
@@ -23,6 +23,8 @@
  * - mode:  mode bit for the path, default 0005 (read and execute for nobody)
  * - exec:	false (default) = do NOT allow to upload or modify scripts, true = allow it (if docroot is mounted, this allows to run scripts!)
  * 			scripts are considered every file having a script-extension (eg. .php, .pl, .py), defined with SCRIPT_EXTENSION_PREG constant
+ * - url:   download url, if NOT a regular webdav.php download should be used, eg. because directory already
+ *          lies within the docroot or is mapped via an alias
  *
  * To correctly support characters with special meaning in url's (#?%), we urlencode them with egw_vfs::encodePathComponent
  * and urldecode all path again, before passing them to php's filesystem functions.
@@ -683,6 +685,9 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 				case 'mode':
 					$mode = egw_vfs::mode2int($value);
 					break;
+				case 'url':
+					// ignored, only used for download_url method
+					break;
 				default:
 					error_log(__METHOD__."('$query') unknown option '$name'!");
 					break;
@@ -711,6 +716,40 @@ class filesystem_stream_wrapper implements iface_stream_wrapper
 		}
 		return $deny;
 	}
+
+	/**
+	 * URL to download a file
+	 *
+	 * We use our webdav handler as download url instead of an own download method.
+	 * The webdav hander (filemanager/webdav.php) recognices eGW's session cookie and of cause understands regular GET requests.
+	 *
+	 * @param string $url
+	 * @param boolean $force_download=false add header('Content-disposition: filename="' . basename($path) . '"'), currently not supported!
+	 * @todo get $force_download working through webdav
+	 * @return string|false string with full download url or false to use default webdav.php url
+	 */
+	static function download_url($url,$force_download=false)
+	{
+		list(,$query) = explode('?',$url,2);
+		parse_str($query,$get);
+		if (empty($get['url'])) return false;	// no download url given for this mount-point
+		
+		if (!($mount_url = egw_vfs::mount_url($url))) return false;	// no mount url found, should not happen
+		list($mount_url) = explode('?',$mount_url);
+		
+		list($url,$query) = explode('?',$url,2);
+		$relpath = substr($url,strlen($mount_url));
+		
+		$download_url = egw_vfs::concat($get['url'],$relpath);
+		if ($download_url[0] == '/')
+		{
+			$download_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://').
+				$_SERVER['HTTP_HOST'].$download_url;
+		}
+		
+		//die(__METHOD__."('$url') --> relpath = $relpath --> $download_url");
+		return $download_url;
+	}
 }
 
 stream_register_wrapper(filesystem_stream_wrapper::SCHEME ,'filesystem_stream_wrapper');
diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index 9f0b5ea1a2..eafb84059f 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -201,6 +201,25 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 		trigger_error(__METHOD__."($path) can't resolve path!\n",E_USER_WARNING);
 		return false;
 	}
+	
+	/**
+	 * Returns mount url of a full url returned by resolve_url
+	 * 
+	 * @param string $fullurl full url returned by resolve_url
+	 * @return string|NULL mount url or null if not found
+	 */
+	static function mount_url($fullurl)
+	{
+		foreach(array_reverse(self::$fstab) as $mounted => $url)
+		{
+			list($url_no_query) = explode('?',$url);
+			if (substr($fullurl,0,1+strlen($url_no_query)) === $url_no_query.'/')
+			{
+				return $url;
+			}
+		}
+		return null;
+	}
 
 	/**
 	 * This method is called immediately after your stream object is created.

From a709044415f2d40eece2518a9894b8dabdb3277b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Sep 2010 11:57:31 +0000
Subject: [PATCH 08/47] only use egw::link on egw_vfs::download_url, if it is
 still a path (relative to EGroupware install dir), allowing filesystem
 streamwrapper to return a complete direct url

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

diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php
index f0a4dd3792..06dcda694b 100644
--- a/filemanager/inc/class.filemanager_select.inc.php
+++ b/filemanager/inc/class.filemanager_select.inc.php
@@ -181,9 +181,11 @@ class filemanager_select
 					}
 					else
 					{
+						$download_url = egw_vfs::download_url(egw_vfs::concat($content['path'],$content['name']));
+						if ($download_url[0] == '/') $download_url = egw::link($download_url);
 						$js = "window.opener.CKEDITOR.tools.callFunction(".
 							$content['ckeditorfuncnum'].",'".
-							htmlspecialchars(egw::link(egw_vfs::download_url(egw_vfs::concat($content['path'],$content['name']))))."',".
+							htmlspecialchars($download_url)."',".
 							"'');\nwindow.close();";
 					}
 					header('Content-type: text/html; charset='.translation::charset());

From cdc0d2fb5ed9ad316a064355bc0cafbfd9875272 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Sep 2010 12:17:19 +0000
Subject: [PATCH 09/47] fixed warning if data is no array and modified method
 signature to allow only an array or NULL as parameter (seems that is the way
 it is used so far)

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

diff --git a/phpgwapi/inc/class.asyncservice.inc.php b/phpgwapi/inc/class.asyncservice.inc.php
index fa6c5045e8..a83ba74f61 100644
--- a/phpgwapi/inc/class.asyncservice.inc.php
+++ b/phpgwapi/inc/class.asyncservice.inc.php
@@ -65,13 +65,13 @@ class asyncservice
 	 * 	eg. '<app><id>X' where id is the internal id of app and X might indicate the action.
 	 * @param string $method Method to be called via ExecMethod($method,$data). $method has the form
 	 * 	'<app>.<class>.<public function>'.
-	 * @param mixed $data This data is passed back when the method is called. It might simply be an
-	 * 	integer id, but it can also be a complete array.
+	 * @param array $data=null This data is passed back when the method is called. EGroupware adds the
+	 *                          rest of the job parameters like id, next (sheduled exec time), times, ...
 	 * @param int $account_id account_id, under which the methode should be called or False for the actual user
 	 * @param boolean $debug=false
 	 * @return boolean False if $id already exists, else True
 	 */
-	function set_timer($times,$id,$method,$data,$account_id=False,$debug=false)
+	function set_timer($times,$id,$method,array $data=null,$account_id=False,$debug=false)
 	{
 		if (empty($id) || empty($method) || $this->read($id) ||
 				!($next = $this->next_run($times,$debug)))
@@ -426,7 +426,7 @@ class asyncservice
 				list($app) = strpos($job['method'],'::') !== false ? explode('_',$job['method']) :
 					explode('.',$job['method']);
 				translation::add_app($app);
-				ExecMethod($job['method'],$job['data']+array_diff_key($job,array('data' => false)));
+				ExecMethod($job['method'],(array)$job['data']+array_diff_key($job,array('data' => false)));
 
 				// re-read job, in case it had been updated or even deleted in the method
 				$updated = $this->read($id);

From c3fe8e2ded1c7d7d762003b9a9e53701089e95e9 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 7 Sep 2010 14:48:13 +0000
Subject: [PATCH 10/47] fix for scrollbar for searchfield in calendar sidebox
 for safari; provided by Chr.Fueller

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

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 60a04cd28f..878dded371 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -648,7 +648,7 @@ class calendar_ui
 		$blur = addslashes(html::htmlspecialchars(lang('Search').'...'));
 		$value = @$_POST['keywords'] ? html::htmlspecialchars($_POST['keywords']) : $blur;
 		$file[++$n] = array(
-			'text' => html::form('<input name="keywords" value="'.$value.'" style="width: 100%;"'.
+			'text' => html::form('<input name="keywords" value="'.$value.'" style="width: 97.5%;"'.
 				' onFocus="if(this.value==\''.$blur.'\') this.value=\'\';"'.
 				' onBlur="if(this.value==\'\') this.value=\''.$blur.'\';" title="'.lang('Search').'">',
 				'','/index.php',array('menuaction'=>'calendar.calendar_uilist.listview')),
@@ -749,6 +749,7 @@ class calendar_ui
 <script type=\"text/javascript\">
 function load_cal(url,id) {
 	var owner='';
+	var i = 0;
 	selectBox = document.getElementById(id);
 	for(i=0; i < selectBox.length; ++i) {
 		if (selectBox.options[i].selected) {

From ac9ccca6e5aa7eb4b4354f9a8fbaeed7fc050e43 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Sep 2010 15:45:47 +0000
Subject: [PATCH 11/47] * infologs with parents in projectmanager templates,
 got now the new parent not the original one from the template (egw.stylite.de
 #8164)

---
 infolog/inc/class.infolog_datasource.inc.php | 28 +++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/infolog/inc/class.infolog_datasource.inc.php b/infolog/inc/class.infolog_datasource.inc.php
index 3101233680..b9d66cf258 100644
--- a/infolog/inc/class.infolog_datasource.inc.php
+++ b/infolog/inc/class.infolog_datasource.inc.php
@@ -136,7 +136,33 @@ class infolog_datasource extends datasource
 			}
 			egw_link::link('infolog',$info['info_id'],$link['app'],$link['id'],$link['remark']);
 		}
-		return array($info['info_id'],$info['info_link_id']);
+		$ret = array($info['info_id'],$info['info_link_id']);
+
+		// if we have a parent set, return our callback to modify the parent id, after all entries are copied
+		if ($info['info_id_parent'])
+		{
+			$ret[] = array($this,'copy_callback');	// callback
+			$ret[] = array($info['info_id'],$info['info_id_parent']);	// $param
+		}
+		return $ret;
+	}
+	
+	/**
+	 * Callback called after copying of all datasource, used to:
+	 * - fix parent id's
+	 *
+	 * @param array $param array($info_id,$info_id_parent)
+	 * @param array $apps_copied array('infolog' => array($old_info_id => $new_info_id))
+	 */
+	public function copy_callback(array $param, array $apps_copied)
+	{
+		//error_log(__METHOD__."(".array2string($param).', '.array2string($apps_copied).')');
+		list($info_id,$parent_id) = $param;
+		if (isset($apps_copied['infolog'][$parent_id]) && ($info = $this->infolog_bo->read($info_id)))
+		{
+			$info['info_id_parent'] = $apps_copied['infolog'][$parent_id];
+			$this->infolog_bo->write($info,false,true,true,true);	// no default and no notification
+		}
 	}
 
 	/**

From a2cb21c455b93fa5a5e49fe6ab8521324fa4f520 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Sep 2010 18:12:18 +0000
Subject: [PATCH 12/47] * create preference for start directory of image
 browser in rich text editor in EGroupware VFS (filemanager), instead of old
 FCK editor configuration

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

diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang
index 08d657baa4..effad95a1e 100644
--- a/phpgwapi/lang/egw_de.lang
+++ b/phpgwapi/lang/egw_de.lang
@@ -644,6 +644,7 @@ south georgia and the south sandwich islands	common	de	SOUTH GEORGIA AND THE SOU
 spain	common	de	SPANIEN
 sri lanka	common	de	SRI LANKA
 start date	common	de	Startdatum
+start directory for image browser of rich text editor in egroupware vfs (filemanager).	common	de	Startverzeichnis für Bildsuche des Editors für formatierten Text im EGroupware VFS (Dateimanager).
 start time	common	de	Startzeit
 start with	common	de	beginnt mit
 starting up...	common	de	Starte...
@@ -733,6 +734,7 @@ value	common	de	Wert
 vanuatu	common	de	VANUATU
 venezuela	common	de	VENEZUELA
 version	common	de	Version
+vfs upload directory	common	de	VFS Upload Verzeichnis
 viet nam	common	de	VIETNAM
 view	common	de	Anzeigen
 virgin islands, british	common	de	VIRGIN ISLANDS, BRITISH
diff --git a/phpgwapi/lang/egw_en.lang b/phpgwapi/lang/egw_en.lang
index 743e16804d..a1bb985452 100644
--- a/phpgwapi/lang/egw_en.lang
+++ b/phpgwapi/lang/egw_en.lang
@@ -645,6 +645,7 @@ south georgia and the south sandwich islands	common	en	SOUTH GEORGIA AND THE SOU
 spain	common	en	SPAIN
 sri lanka	common	en	SRI LANKA
 start date	common	en	Start date
+start directory for image browser of rich text editor in egroupware vfs (filemanager).	common	en	Start directory for image browser of rich text editor in EGroupware VFS (filemanager).
 start time	common	en	Start time
 start with	common	en	start with
 starting up...	common	en	Starting Up...
@@ -734,6 +735,7 @@ value	common	en	Value
 vanuatu	common	en	VANUATU
 venezuela	common	en	VENEZUELA
 version	common	en	Version
+vfs upload directory	common	en	VFS upload directory
 viet nam	common	en	VIET NAM
 view	common	en	View
 virgin islands, british	common	en	VIRGIN ISLANDS, BRITISH

From 577c8926bcedb2a841a1d32edd2b32bf59b2cad0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Sep 2010 19:08:13 +0000
Subject: [PATCH 13/47] added abstract function to base egw_framework, as it
 get called from admin/inc/hook_top_menu.inc.php for pending updates

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

diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 604ac382eb..1050a48b3e 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -929,6 +929,19 @@ abstract class egw_framework
 		self::$top_menu_extra[$id] = $entry;
 	}
 
+	/**
+	* called by hooks to add an icon in the topmenu info location
+	*
+	* @param string $id unique element id
+	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	* @param string $iconlink where the icon links to
+	* @param booleon $blink set true to make the icon blink
+	* @param mixed $tooltip string containing the tooltip html, or null of no tooltip
+	* @access public
+	* @return void
+	*/
+	abstract function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null);
+
 	/**
 	 * Call and return content of 'after_navbar' hook
 	 * 

From f49eaf39ce20bf327004320b00d6a11f1c2136cd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Sep 2010 07:45:38 +0000
Subject: [PATCH 14/47] fixed in some update situations called unset_datetime
 on egw_minimal object

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

diff --git a/phpgwapi/inc/class.preferences.inc.php b/phpgwapi/inc/class.preferences.inc.php
index 020040c368..f33a026c44 100644
--- a/phpgwapi/inc/class.preferences.inc.php
+++ b/phpgwapi/inc/class.preferences.inc.php
@@ -405,7 +405,7 @@ class preferences
 			//echo "<p>".__METHOD__."() tz=$prefs[tz] --> tz_offset={$GLOBALS['egw_info']['user']['preferences']['common']['tz_offset']}</p>\n";
 
 			// ToDo: get rid of that
-			if (isset($GLOBALS['egw']) && is_object($GLOBALS['egw']))
+			if (isset($GLOBALS['egw']) && is_a($GLOBALS['egw'],'egw'))
 			{
 				$GLOBALS['egw']->unset_datetime();	// to force an update
 			}

From 48a21f74de056b8cdfd39e78229f6159417bd711 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Sep 2010 08:55:06 +0000
Subject: [PATCH 15/47] fixed PHP Warning:  fclose(): 146 is not a valid stream
 resource in setup-cli.php --update

---
 setup/setup-cli.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index b6edc9d8fb..9b6b11a02d 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -236,12 +236,11 @@ function do_backup($arg,$quite_check=false)
 		}
 		else
 		{
-			$db_backup =& CreateObject('phpgwapi.db_backup');
+			$db_backup = new db_backup();
 			if (is_resource($f = $db_backup->fopen_backup($backup)))
 			{
 				echo lang('Backup started, this might take a few minutes ...')."\n";
 				$db_backup->backup($f);
-				fclose($f);
 				echo lang('Backup finished')."\n";
 			}
 			else	// backup failed ==> dont start the upgrade
@@ -507,7 +506,7 @@ function do_usage($what='')
 		echo '--admin '.lang('creates an admin user: domain(default),[config user(admin)],password,username,password,[first name],[last name],[email]')."\n";
 		echo '--language '.lang('install or update translations: domain(all),[config user(admin)],password,[[+]lang1[,lang2,...]] + adds, no langs update existing ones')."\n";
 		echo '--backup '.lang('domain(all),[config user(admin)],password,[file-name(default: backup-dir/db_backup-YYYYMMDDHHii)]')."\n";
-		echo '--update '.lang('run a database schema update (if necessary): domain(all),[config user(admin)],password')."\n";
+		echo '--update '.lang('run a database schema update (if necessary): domain(all),[config user(admin)],password').'[,no = no backup]'."\n";
 		echo lang('You can use the header user and password for every domain too. If the password is not set via the commandline, it is read from the enviroment variable EGW_CLI_PASSWORD or queried from the user.')."\n";
 	}
 	if (!$what || $what == 'header')

From f4fa73412be5b4562bb229db35d67a2de41cd5cd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Sep 2010 09:45:20 +0000
Subject: [PATCH 16/47] * fixed privated contacts got synced back as public
 caused by setting private=0, if owner != current user, but NOT checking if
 owner is set, which is not the case for SyncML

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

diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index 0850b97bb4..3352d69b76 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -193,7 +193,7 @@ class addressbook_vcal extends addressbook_bo
 				}
     		}
     	}
-    	if ($contact['owner'] != $this->user)
+    	if (isset($contact['owner']) && $contact['owner'] != $this->user)
     	{
     		$contact['private'] = 0;	// foreign contacts are never private!
     	}
@@ -983,7 +983,7 @@ class addressbook_vcal extends addressbook_bo
 		}
 
 		$this->fixup_contact($contact);
-
+		
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__	.

From dc88857d9ea23bdc0d51b7512a81b6af544dbda3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Sep 2010 09:47:57 +0000
Subject: [PATCH 17/47] further fix for "private contacts got not synced"
 issue, r31918 was not working, because filter[owner] was an array

---
 addressbook/inc/class.addressbook_sql.inc.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 61c22853e9..bbf2bf5517 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -278,8 +278,18 @@ class addressbook_sql extends so_sql_cf
 			{
 				if (!($filter['owner'] = array_intersect((array)$filter['owner'],array_keys($this->grants)))) return false;
 
-				// for an owner filter, which is NOT the current user, filter out private entries
-				if ($filter['owner'] != $GLOBALS['egw_info']['user']['account_id']) $filter['private'] = 0;
+				// for an owner filter, which does NOT include current user, filter out private entries
+				if (!in_array($GLOBALS['egw_info']['user']['account_id'],$filter['owner']))
+				{
+					$filter['private'] = 0;
+				}
+				// if multiple addressbooks (incl. current owner) are searched, we need full acl filter
+				elseif(count($filter['owner']) > 1)
+				{
+					$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
+						" OR contact_private=0 AND $this->table_name.contact_owner IN (".
+						implode(',',array_keys($this->grants)).") OR $this->table_name.contact_owner IS NULL)";
+				}
 			}
 			else	// search all addressbooks, incl. accounts
 			{

From 77066454230d2ba2d8d07310f364c67f49d24cf8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Sep 2010 12:24:05 +0000
Subject: [PATCH 18/47] check if app is either installed or supports the used
 database (before installed, but not supported apps where not updated)

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

diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php
index 94dd40a2fc..e41206258b 100755
--- a/setup/inc/class.setup_process.inc.php
+++ b/setup/inc/class.setup_process.inc.php
@@ -109,7 +109,8 @@ class setup_process
 			/* stuff the rest of the apps, but only those with available upgrades */
 			foreach($setup_info as $key => $value)
 			{
-				if (isset($value['only_db']) && (
+				// check if app is either installed or supports the used database
+				if (!isset($value['currentver']) && isset($value['only_db']) && (
 					is_array($value['only_db']) && !in_array($GLOBALS['egw_setup']->db->Type,$value['only_db']) ||
 					!is_array($value['only_db']) && $GLOBALS['egw_setup']->db->Type != $value['only_db']))
 				{

From bb96dda0a774f412f6816f56a8e08d33b825d321 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Sep 2010 16:02:40 +0000
Subject: [PATCH 19/47] Log mails to log file specified in
 ['egw_info']['server']['log_mail'] or regular error_log for true (can be set
 either in DB or header.inc.php)

---
 phpgwapi/inc/class.send.inc.php | 45 ++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index c17ac2c9fc..fc7bcbd6ff 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -29,10 +29,51 @@
 	*/
 	class send extends PHPMailer
 	{
+		/**
+		 * Log mails to log file specified in $GLOBALS['egw_info']['server']['log_mail']
+		 * or regular error_log for true (can be set either in DB or header.inc.php).
+		 * 
+		 * We can NOT supply this method as callback to phpMailer, as phpMailer only accepts
+		 * functions (not methods) and from a function we can NOT access $this->ErrorInfo.
+		 * 
+		 * @param boolean $isSent
+		 * @param string $to
+		 * @param string $cc
+		 * @param string $bcc
+		 * @param string $subject
+		 * @param string $body
+		 */
+  		protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body)
+		{
+			if ($GLOBALS['egw_info']['server']['log_mail'])
+			{
+				$msg = $GLOBALS['egw_info']['server']['log_mail'] !== true ? date('Y-m-d H:i:s').': ' : '';
+				$msg .= ($isSent ? 'Mail send' : 'Mail NOT send').
+					' to '.$to.' with subject: "'.trim($subject).'"';
+
+				if ($GLOBALS['egw_info']['user']['account_id'])
+				{
+					$msg .= ' from user #'.$GLOBALS['egw_info']['user']['account_id'].' ('.
+						common::grab_owner_name($GLOBALS['egw_info']['user']['account_id']).')';
+				}
+				if (!$isSent)
+				{
+					$this->SetError('');	// queries error from (private) smtp and stores it in $this->ErrorInfo
+					$msg .= ': ERROR '.str_replace(array('Language string failed to load: smtp_error',"\n","\r"),'',
+						strip_tags($this->ErrorInfo));
+				}
+				error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 1,
+					$GLOBALS['egw_info']['server']['log_mail']);
+			}
+			// calling the orginal callback of phpMailer
+			parent::doCallback($isSent,$to,$cc,$bcc,$subject,$body);
+		}
+
 		var $err    = array();
 		var $to_res = array();
 		// switching on debug with a numeric value other than 0, switches debug in PHPMailer/SMTP Class on
-		var $debug  = false; // false;
+		var $debug  = false;
+
 		/**
 		* eGW specific initialisation of the PHPMailer: charset, language, smtp-host, ...
 		*
@@ -41,6 +82,8 @@
 		*/
 		function send()
 		{
+			parent::__construct(true);	// throw exceptions instead of echoing errors
+
 			if ($this->debug && is_numeric($this->debug)) $this->SMTPDebug = $this->debug;
 			if ($this->Subject || $this->Body || count($this->to))
 			{

From 6d552b26d190ce2f5c099d5901cecaa621d226cc Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 8 Sep 2010 16:19:29 +0000
Subject: [PATCH 20/47] Remove call to missing function - doesn't look needed,
 it works without.

---
 importexport/inc/class.importexport_import_ui.inc.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php
index 70dda8dd88..92018c529c 100644
--- a/importexport/inc/class.importexport_import_ui.inc.php
+++ b/importexport/inc/class.importexport_import_ui.inc.php
@@ -32,7 +32,6 @@
 		private $plugins;
 
 		public function __construct() {
-			$GLOBALS['egw']->js->validate_file('.','import_dialog','importexport');
 			$this->plugins = importexport_helper_functions::get_plugins('all','import');
 			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
 		}
@@ -127,7 +126,6 @@
 				}
 			}
 			$response = new xajaxResponse();
-			$response->addScript('import_dialog.change_definition(document.getElementId(\'exec[definition]\'));');
 			$response->addAssign('exec[definition]','innerHTML',$sel_options['definition']);
 			return $response->getXML();
 		}

From 00acdcb48b79d9f25ae60de2b9d5ec54bd7559b1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 8 Sep 2010 16:22:55 +0000
Subject: [PATCH 21/47] fixed wrong type parameter for logging to a file and
 some formatting

---
 phpgwapi/inc/class.send.inc.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index fc7bcbd6ff..682469e9b2 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -47,7 +47,7 @@
 		{
 			if ($GLOBALS['egw_info']['server']['log_mail'])
 			{
-				$msg = $GLOBALS['egw_info']['server']['log_mail'] !== true ? date('Y-m-d H:i:s').': ' : '';
+				$msg = $GLOBALS['egw_info']['server']['log_mail'] !== true ? date('Y-m-d H:i:s')."\n" : '';
 				$msg .= ($isSent ? 'Mail send' : 'Mail NOT send').
 					' to '.$to.' with subject: "'.trim($subject).'"';
 
@@ -59,10 +59,13 @@
 				if (!$isSent)
 				{
 					$this->SetError('');	// queries error from (private) smtp and stores it in $this->ErrorInfo
-					$msg .= ': ERROR '.str_replace(array('Language string failed to load: smtp_error',"\n","\r"),'',
+					$msg .= $GLOBALS['egw_info']['server']['log_mail'] !== true ? "\n" : ': ';
+					$msg .= 'ERROR '.str_replace(array('Language string failed to load: smtp_error',"\n","\r"),'',
 						strip_tags($this->ErrorInfo));
 				}
-				error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 1,
+				if ($GLOBALS['egw_info']['server']['log_mail'] !== true) $msg .= "\n\n";
+
+				error_log($msg,$GLOBALS['egw_info']['server']['log_mail'] === true ? 0 : 3,
 					$GLOBALS['egw_info']['server']['log_mail']);
 			}
 			// calling the orginal callback of phpMailer

From 117299fc3b01a7d11d6c297822b7886eaa826474 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 8 Sep 2010 16:25:32 +0000
Subject: [PATCH 22/47] Fix (hopefully) for IE unable to change popup size

---
 importexport/setup/etemplates.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/importexport/setup/etemplates.inc.php b/importexport/setup/etemplates.inc.php
index 6f1302c173..429b20c8df 100644
--- a/importexport/setup/etemplates.inc.php
+++ b/importexport/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 /**
 	* eGroupWare - eTemplates for Application importexport
 	* http://www.egroupware.org
-	* generated by soetemplate::dump4setup() 2010-03-11 10:40
+	* generated by soetemplate::dump4setup() 2010-09-08 18:23
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package importexport
@@ -12,7 +12,7 @@
 
 $templ_version=1;
 
-$templ_data[] = array('name' => 'importexport.definition_index','template' => '','lang' => '','group' => '0','version' => '0.0.1','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:4:{s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"span";s:11:",lr_padding";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";s:4:"span";s:11:",lr_padding";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Application";s:4:"span";s:11:",lr_padding";}s:1:"D";a:4:{s:5:"align";s:6:"center";s:4:"type";s:5:"label";s:5:"label";s:13:"Allowed users";s:4:"span";s:11:",lr_padding";}s:1:"E";a:5:{s:5:"label";s:3:"Add";s:5:"align";s:6:"center";s:4:"type";s:6:"button";s:4:"span";s:11:",lr_padding";s:7:"onclick";s:226:"window.open(egw::link(\'/index.php\',\'menuaction=importexport.importexport_definitions_ui.wizard\'),\'\',\'dependent=yes,width=500,height=500,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false; return false;";}s:1:"F";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:6:{s:5:"label";s:6:"Delete";s:4:"name";s:15:"delete_selected";s:4:"type";s:6:"button";s:4:"help";s:31:"delete ALL selected definitions";s:4:"size";s:6:"delete";s:7:"onclick";s:65:"return confirm(\'Do you really want to DELETE this definitions?\');";}i:2;a:5:{s:5:"label";s:6:"Export";s:4:"name";s:15:"export_selected";s:4:"type";s:6:"button";s:4:"help";s:31:"export ALL selected definitions";s:4:"size";s:10:"fileexport";}}}i:2;a:6:{s:1:"A";a:4:{s:7:"no_lang";s:1:"1";s:4:"type";s:5:"image";s:4:"span";s:11:",lr_padding";s:4:"name";s:12:"${row}[type]";}s:1:"B";a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";s:4:"type";s:5:"label";s:4:"span";s:11:",lr_padding";}s:1:"C";a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[application]";s:4:"type";s:5:"label";s:4:"span";s:11:",lr_padding";}s:1:"D";a:6:{s:7:"no_lang";s:1:"1";s:4:"type";s:14:"select-account";s:4:"span";s:11:",lr_padding";s:8:"readonly";s:1:"1";s:4:"name";s:21:"${row}[allowed_users]";s:4:"size";s:6:"5,both";}s:1:"E";a:5:{s:5:"align";s:6:"center";s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:5:"label";s:4:"Edit";s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:7:"onclick";s:251:"window.open(egw::link(\'/index.php\',\'menuaction=importexport.importexport_definitions_ui.edit&definition=$row_cont[name]\'),\'\',\'dependent=yes,width=500,height=500,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false; return false;";}i:2;a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:41:"return confirm(\'Delete this definition\');";s:4:"name";s:32:"delete[$row_cont[definition_id]]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:21:"Delete this eTemplate";}}s:1:"F";a:4:{s:5:"align";s:6:"center";s:4:"name";s:34:"selected[$row_cont[definition_id]]";s:4:"type";s:8:"checkbox";s:4:"help";s:34:"select this eTemplate to delete it";}}}s:4:"cols";i:6;s:4:"rows";i:2;}}}s:4:"cols";i:1;s:4:"rows";i:2;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '.redItalic { color:red; font-style:italic;}			td.lr_padding { padding-left: 5px; padding-right: 5px; }','modified' => '1145972373',);
+$templ_data[] = array('name' => 'importexport.definition_index','template' => '','lang' => '','group' => '0','version' => '0.0.1','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:2:"h1";s:6:",!@msg";}i:1;a:1:{s:1:"A";a:4:{s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Type";s:4:"span";s:11:",lr_padding";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";s:4:"span";s:11:",lr_padding";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Application";s:4:"span";s:11:",lr_padding";}s:1:"D";a:4:{s:5:"align";s:6:"center";s:4:"type";s:5:"label";s:5:"label";s:13:"Allowed users";s:4:"span";s:11:",lr_padding";}s:1:"E";a:5:{s:5:"label";s:3:"Add";s:5:"align";s:6:"center";s:4:"type";s:6:"button";s:4:"span";s:11:",lr_padding";s:7:"onclick";s:226:"window.open(egw::link(\'/index.php\',\'menuaction=importexport.importexport_definitions_ui.wizard\'),\'\',\'dependent=yes,width=500,height=500,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false; return false;";}s:1:"F";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:6:{s:5:"label";s:6:"Delete";s:4:"name";s:15:"delete_selected";s:4:"type";s:6:"button";s:4:"help";s:31:"delete ALL selected definitions";s:4:"size";s:6:"delete";s:7:"onclick";s:65:"return confirm(\'Do you really want to DELETE this definitions?\');";}i:2;a:5:{s:5:"label";s:6:"Export";s:4:"name";s:15:"export_selected";s:4:"type";s:6:"button";s:4:"help";s:31:"export ALL selected definitions";s:4:"size";s:10:"fileexport";}}}i:2;a:6:{s:1:"A";a:4:{s:7:"no_lang";s:1:"1";s:4:"type";s:5:"image";s:4:"span";s:11:",lr_padding";s:4:"name";s:12:"${row}[type]";}s:1:"B";a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:12:"${row}[name]";s:4:"type";s:5:"label";s:4:"span";s:11:",lr_padding";}s:1:"C";a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[application]";s:4:"type";s:5:"label";s:4:"span";s:11:",lr_padding";}s:1:"D";a:6:{s:7:"no_lang";s:1:"1";s:4:"type";s:14:"select-account";s:4:"span";s:11:",lr_padding";s:8:"readonly";s:1:"1";s:4:"name";s:21:"${row}[allowed_users]";s:4:"size";s:6:"5,both";}s:1:"E";a:5:{s:5:"align";s:6:"center";s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:5:"label";s:4:"Edit";s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:7:"onclick";s:263:"window.open(egw::link(\'/index.php\',\'menuaction=importexport.importexport_definitions_ui.edit&definition=$row_cont[name]\'),\'\',\'dependent=yes,width=500,height=500,location=no,menubar=no,toolbar=no,scrollbars=yes,resizable=1,status=yes\'); return false; return false;";}i:2;a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:41:"return confirm(\'Delete this definition\');";s:4:"name";s:32:"delete[$row_cont[definition_id]]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:21:"Delete this eTemplate";}}s:1:"F";a:4:{s:5:"align";s:6:"center";s:4:"name";s:34:"selected[$row_cont[definition_id]]";s:4:"type";s:8:"checkbox";s:4:"help";s:34:"select this eTemplate to delete it";}}}s:4:"cols";i:6;s:4:"rows";i:2;}}}s:4:"cols";i:1;s:4:"rows";i:2;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '.redItalic { color:red; font-style:italic;}			td.lr_padding { padding-left: 5px; padding-right: 5px; }','modified' => '1145972373',);
 
 $templ_data[] = array('name' => 'importexport.export_dialog','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:1:{s:2:"c3";s:15:"save_definition";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:3:"tab";s:5:"label";s:25:"General|Selection|Options";s:4:"name";s:37:"general_tab|selection_tab|options_tab";}}i:3;a:1:{s:1:"A";a:3:{s:4:"type";s:8:"checkbox";s:5:"label";s:18:"Save as definition";s:4:"name";s:18:"save_as_definition";}}i:4;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Export";s:4:"name";s:6:"export";s:7:"onclick";s:36:"xajax_eT_wrapper(this);return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:7:"Preview";s:4:"name";s:7:"preview";s:7:"onclick";s:36:"xajax_eT_wrapper(this);return false;";}}i:2;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:5:"align";s:5:"right";s:4:"name";s:6:"cancel";s:7:"onclick";s:29:"window.close(); return false;";}}}i:5;a:1:{s:1:"A";a:6:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"name";s:11:"preview-box";s:6:"needed";s:1:"1";i:1;a:1:{s:4:"type";s:5:"label";}s:4:"span";s:12:",preview-box";}}i:6;a:1:{s:1:"A";a:7:{s:4:"type";s:3:"box";s:4:"size";s:1:"1";s:4:"span";s:20:",preview-box-buttons";s:4:"name";s:19:"preview-box-buttons";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:2:"OK";s:5:"align";s:6:"center";s:7:"onclick";s:167:"document.getElementById(form::name(\'preview-box\')).style.display=\'none\'; document.getElementById(form::name(\'preview-box-buttons\')).style.display=\'none\'; return false;";}s:6:"needed";s:1:"1";s:5:"align";s:6:"center";}}}s:4:"rows";i:6;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.preview-box {
   position: absolute;

From f5f47c4ad1b986931d220cbd2dca7fa207fd8564 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 8 Sep 2010 20:57:06 +0000
Subject: [PATCH 23/47] Take some extra measures to get space for column
 headers without destroying the keys in the map

---
 ...portexport_wizard_basic_import_csv.inc.php | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
index 4f9369d214..fa96d540b9 100644
--- a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
+++ b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
@@ -183,9 +183,19 @@ class importexport_wizard_basic_import_csv
 		if ($content['step'] == 'wizard_step50')
 		{
 			array_shift($content['csv_fields']);
-			array_shift($content['field_mapping']);
-			array_shift($content['field_conversion']);
-
+			// Need to move everything down 1 to remove header, but shift will re-key
+			unset($content['field_mapping'][0]);
+			unset($content['field_conversion'][0]);
+			foreach(array('field_mapping', 'field_conversion') as $field) {
+				foreach($content[$field] as $key => $value)
+				{
+					if($value) {
+						$content[$field][$key-1] = $content[$field][$key];
+					}
+					unset($content[$field][$key]);
+				}
+				ksort($content[$field]);
+			}
 			foreach($content['field_conversion'] as $field => $convert) {
 				if(!trim($convert)) unset($content['field_conversion'][$field]);
 			}
@@ -212,10 +222,21 @@ class importexport_wizard_basic_import_csv
 				$content['field_mapping'] = $content['plugin_options']['field_mapping'];
 				$content['field_conversion'] = $content['plugin_options']['field_conversion'];
 			}
-			array_unshift($content['csv_fields'],array('row0'));
-			array_unshift($content['field_mapping'],array('row0'));
-			array_unshift($content['field_conversion'],array('row0'));
-			
+
+			array_unshift($content['csv_fields'], array('row0'));
+			// Need to move everything down 1 to make room for header, but unshift will re-key
+			// which causes problems if you skip a field.
+			foreach(array('field_mapping', 'field_conversion') as $field) {
+				foreach(array_reverse($content[$field], true) as $key => $value)
+				{
+					if($value) {
+						$content[$field][$key+1] = $content[$field][$key];
+					}
+					unset($content[$field][$key]);
+				}
+				ksort($content[$field]);
+			}
+
 			$j = 1;
 			foreach ($content['csv_fields'] as $field)
 			{

From 83dae424e05d21711823602a1c59fea163defd9e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Sep 2010 09:06:13 +0000
Subject: [PATCH 24/47] new method to abstract MySQL function unix_timestamp
 (convert db timestamp to integer)

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

diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 9d881fe142..c893bc6419 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -1232,6 +1232,28 @@ class egw_db
 		return call_user_func_array(array(&$this->Link_ID,'concat'),$args);
 	}
 
+	/**
+	 * Convert a DB specific timestamp in a unix timestamp stored as integer, like MySQL: UNIX_TIMESTAMP(ts)
+	 *
+	 * @param string $expr name of an integer column or integer expression
+	 * @return string SQL expression of type timestamp
+	 */
+	function unix_timestamp($expr)
+	{
+		switch($this->Type)
+		{
+			case 'mysql':
+				return "UNIX_TIMESTAMP($expr)";
+
+			case 'pgsql':
+				return "DATE_PART('epoch',$expr)";
+
+			case 'mssql':
+				return "DATEDIFF(second,'1970-01-01',($expr))";
+		}
+		
+	}
+
 	/**
 	 * Convert a unix timestamp stored as integer in the db into a db timestamp, like MySQL: FROM_UNIXTIME(ts)
 	 *

From 8160ff24721a3d84f5da936b49d117959eae794c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Sep 2010 09:08:37 +0000
Subject: [PATCH 25/47] if modified timestamp get set, reset evtl. existing
 deleted timestamp, as recovering of deleted entries does NOT work otherwise

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

diff --git a/phpgwapi/inc/class.contenthistory.inc.php b/phpgwapi/inc/class.contenthistory.inc.php
index 36c49c2a5f..61b373202c 100644
--- a/phpgwapi/inc/class.contenthistory.inc.php
+++ b/phpgwapi/inc/class.contenthistory.inc.php
@@ -165,6 +165,9 @@ class contenthistory
 					'sync_changedby'	=> $GLOBALS['egw_info']['user']['account_id'],
 					$_action == 'delete' ? 'sync_deleted' : 'sync_modified' => $this->db->to_timestamp($_ts),
 				);
+				// if deleted entry get's modified, removed deleted timestamp, as it got recovered
+				if ($_action == 'modify') $newData['sync_deleted'] = null;
+				
 				$this->db->update(self::TABLE, $newData, $where,__LINE__,__FILE__);
 				break;
 		}

From 8241be4091a93b1e8da2f372b650252fff4673e1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 9 Sep 2010 09:11:57 +0000
Subject: [PATCH 26/47] storing deleted timestamp instead of a deleted flag, to
 allow to use calendar table instead of egw_api_content_history later on

---
 calendar/inc/class.calendar_bo.inc.php       |  3 --
 calendar/inc/class.calendar_boupdate.inc.php |  2 +-
 calendar/inc/class.calendar_so.inc.php       |  4 +-
 calendar/inc/class.calendar_uiforms.inc.php  |  4 +-
 calendar/setup/setup.inc.php                 |  3 +-
 calendar/setup/tables_current.inc.php        |  4 +-
 calendar/setup/tables_update.inc.php         | 50 ++++++++++++++++++++
 7 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index bfbef52afe..9b0a8cd5c9 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -819,9 +819,6 @@ class calendar_bo
 					$alarm['time'] = $this->date2usertime($alarm['time'],$date_format);
 				}
 			}
-
-			// Fix deleted flag
-			$event['deleted'] = egw_db::from_bool($event['deleted']);
 		}
 	}
 
diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index d2a61a2365..4d057d0e3d 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1227,7 +1227,7 @@ class calendar_boupdate extends calendar_bo
 			}
 			elseif ($config['calendar_delete_history'])
 			{
-				$event['deleted'] = true;
+				$event['deleted'] = time();
 				$this->save($event, $ignore_acl);
 				// Actually delete alarms
 				if (isset($event['alarm']) && is_array($event['alarm']))
diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index ef62f0b17c..a6a51d9cc4 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -403,7 +403,7 @@ class calendar_so
 
 			if($filter != 'deleted')
 			{
-				$where['cal_deleted'] = false;
+				$where[] = 'cal_deleted IS NULL';
 			}
 			switch($filter)
 			{
@@ -411,7 +411,7 @@ class calendar_so
 					$where['cal_public'] = 1;
 					$where[] = "cal_status != 'R'"; break;
 				case 'deleted':
-					$where['cal_deleted'] = true; break;
+					$where[] = 'cal_deleted IS NOT NULL'; break;
 				case 'unknown':
 					$where[] = "cal_status='U'"; break;
 				case 'accepted':
diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 73febc4968..20dc1991de 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1442,8 +1442,8 @@ function replace_eTemplate_onsubmit()
 		$config = config::read('phpgwapi');
 		if($config['calendar_delete_history'] && $event['deleted'] && $GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			$content['deleted'] = $preserv['deleted'] = false;
-			$etpl->set_cell_attribute('button[save]', 'label', 'recover');
+			$content['deleted'] = $preserv['deleted'] = null;
+			$etpl->set_cell_attribute('button[save]', 'label', 'Recover');
 			$etpl->set_cell_attribute('button[apply]', 'disabled', true);
 		}
 
diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index 88a9b7e6a4..a0d0d288d0 100755
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -10,7 +10,7 @@
  */
 
 $setup_info['calendar']['name']    = 'calendar';
-$setup_info['calendar']['version'] = '1.9.001';
+$setup_info['calendar']['version'] = '1.9.002';
 $setup_info['calendar']['app_order'] = 3;
 $setup_info['calendar']['enable']  = 1;
 $setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index';
@@ -68,3 +68,4 @@ $setup_info['calendar']['check_install'] = array(
 );
 
 
+
diff --git a/calendar/setup/tables_current.inc.php b/calendar/setup/tables_current.inc.php
index f2bb3d5657..5f42fe0588 100644
--- a/calendar/setup/tables_current.inc.php
+++ b/calendar/setup/tables_current.inc.php
@@ -31,11 +31,11 @@ $phpgw_baseline = array(
 			'cal_created' => array('type' => 'int','precision' => '8','nullable' => False,'comment' => 'creation time of event'),
 			'cal_recurrence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0','comment' => 'cal_start of original recurrence for exception'),
 			'tz_id' => array('type' => 'int','precision' => '4','comment' => 'key into egw_cal_timezones'),
-			'cal_deleted' => array('type' => 'bool','nullable' => False,'default' => '0','comment' => '1 if the event has been deleted, but you want to keep it around')
+			'cal_deleted' => array('type' => 'int','precision' => '8','comment' => 'ts when event was deleted')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
-		'ix' => array('cal_uid','cal_owner'),
+		'ix' => array('cal_uid','cal_owner','cal_deleted'),
 		'uc' => array()
 	),
 	'egw_cal_holidays' => array(
diff --git a/calendar/setup/tables_update.inc.php b/calendar/setup/tables_update.inc.php
index a23a726900..34ac4b0ddb 100644
--- a/calendar/setup/tables_update.inc.php
+++ b/calendar/setup/tables_update.inc.php
@@ -2102,3 +2102,53 @@ function calendar_upgrade1_8()
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001';
 }
 
+/**
+ * Convert bool column cal_deleted with egw_api_content_history table to a unix timestamp
+ * 
+ * @return string
+ */
+function calendar_upgrade1_9_001()
+{
+	/* done by RefreshTable() anyway
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_deleted',array(
+		'type' => 'int',
+		'precision' => '8',
+		'comment' => 'ts when event was deleted'
+	));*/
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal',array(
+		'fd' => array(
+			'cal_id' => array('type' => 'auto','nullable' => False),
+			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'unique id of event(-series)'),
+			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'event owner / calendar'),
+			'cal_category' => array('type' => 'varchar','precision' => '30','comment' => 'category id'),
+			'cal_modified' => array('type' => 'int','precision' => '8','comment' => 'ts of last modification'),
+			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
+			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1','comment' => '1=public, 0=private event'),
+			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_description' => array('type' => 'text'),
+			'cal_location' => array('type' => 'varchar','precision' => '255'),
+			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'cal_id of series for exception'),
+			'cal_modifier' => array('type' => 'int','precision' => '4','comment' => 'user who last modified event'),
+			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0','comment' => '1 for non-blocking events'),
+			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
+			'cal_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag for optimistic locking'),
+			'cal_creator' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'creating user'),
+			'cal_created' => array('type' => 'int','precision' => '8','nullable' => False,'comment' => 'creation time of event'),
+			'cal_recurrence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0','comment' => 'cal_start of original recurrence for exception'),
+			'tz_id' => array('type' => 'int','precision' => '4','comment' => 'key into egw_cal_timezones'),
+			'cal_deleted' => array('type' => 'int','precision' => '8','comment' => 'ts when event was deleted')
+		),
+		'pk' => array('cal_id'),
+		'fk' => array(),
+		'ix' => array('cal_uid','cal_owner','cal_deleted'),
+		'uc' => array()
+	),array(
+		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true,'bool').' THEN '.
+			'(SELECT '.$GLOBALS['egw_setup']->db->unix_timestamp('sync_deleted').
+			" FROM egw_api_content_history WHERE sync_appname='calendar' AND sync_contentid=cal_id)".
+			' ELSE NULL END',
+	));
+
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.002';
+}
+

From 5153a61a6337f5a1753c6fb85f9eb063aadf8cfa Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 9 Sep 2010 10:19:23 +0000
Subject: [PATCH 27/47] preserving ampersands while converting html to text;
 improving linebreak behavior; switching off WordWrapn (by setting it to 0) in
 phpmailer, as we handle our linebreaking on our own

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

diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 6b7cc45db1..c91af7255d 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -1143,7 +1143,7 @@ class translation
 		);
 		$Replace = array ('',
 			'"',
-			'+',
+			'#amper#sand#',
 			'<',
 			'>',
 			' ',
@@ -1221,29 +1221,25 @@ class translation
 		// we dont reduce whitespace at the start or the end of the line, since its used for structuring the document
 		#$_html = preg_replace('~^\s+~m','',$_html);
 		#$_html = preg_replace('~\s+$~m','',$_html);
-		// restoring the preserved blockquote
-		//$_html = str_replace('#blockquote#type#cite#','<blockquote type="cite">',$_html);
-
-
+		// restoring ampersands
+		$_html = str_replace('#amper#sand#','&',$_html);
 		$_html = html_entity_decode($_html, ENT_COMPAT, $displayCharset);
 		//self::replaceEmailAdresses($_html);
 		#error_log($text);
 		$pos = strpos($_html, 'blockquote');
-		#error_log("convert HTML2Text");
+		//error_log("convert HTML2Text: $_html");
 		if($pos === false) {
 			return $_html;
 		} else {
 			$indent = 0;
 			$indentString = '';
 
-			//$quoteParts = preg_split('/<blockquote type="cite">/', $_html, -1, PREG_SPLIT_OFFSET_CAPTURE);
 			$quoteParts = preg_split('/#blockquote#type#cite#/', $_html, -1, PREG_SPLIT_OFFSET_CAPTURE);
 			foreach($quoteParts as $quotePart) {
 				if($quotePart[1] > 0) {
 					$indent++;
 					$indentString .= '>';
 				}
-				//$quoteParts2 = preg_split('/<\/blockquote>/', $quotePart[0], -1, PREG_SPLIT_OFFSET_CAPTURE);
 				$quoteParts2 = preg_split('/#blockquote#end#cite#/', $quotePart[0], -1, PREG_SPLIT_OFFSET_CAPTURE);
 
 				foreach($quoteParts2 as $quotePart2) {
@@ -1255,9 +1251,10 @@ class translation
 					$quoteParts3 = explode("\r\n", $quotePart2[0]);
 
 					foreach($quoteParts3 as $quotePart3) {
+						//error_log(__METHOD__.__LINE__.'Line:'.$quotePart3);
 						$allowedLength = 76-strlen("\r\n$indentString");
 						// only break lines, if not already indented
-						if ($quotePart3[0] != $indentString)
+						if (substr($quotePart3,0,strlen($indentString)) != $indentString)
 						{
 							if (strlen($quotePart3) > $allowedLength) {
 								$s=explode(" ", $quotePart3);
@@ -1268,11 +1265,13 @@ class translation
 									// only break long words within the wordboundaries,
 									// but it may destroy links, so we check for href and dont do it if we find it
 									if($cnt > $allowedLength && stripos($v,'href=')===false) {
+										//error_log(__METHOD__.__LINE__.'LongWordFound:'.$v);
 										$v=wordwrap($v, $allowedLength, "\r\n$indentString", true);
 									}
 									// the rest should be broken at the start of the new word that exceeds the limit
 									if ($linecnt+$cnt > $allowedLength) {
 										$v="\r\n$indentString$v";
+										//error_log(__METHOD__.__LINE__.'breaking here:'.$v);
 										$linecnt = 0;
 									} else {
 										$linecnt += $cnt;
@@ -1281,6 +1280,7 @@ class translation
 								}
 							}
 						}
+						//error_log(__METHOD__.__LINE__.'partString to return:'.$indentString . $quotePart3);
 						$asciiTextBuff[] = $indentString . $quotePart3 ;
 					}
 				}

From ce35264ed93c254af093d405aa9599d44289f1f7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 10 Sep 2010 07:01:41 +0000
Subject: [PATCH 28/47] fix for postgreSQL bug reported by Anthony Messina
 (amessina-at-messinet.com): sync_contentid is varchar(60) and needs explicit
 cast, fixed by letting egw_db do the quoting, which is more save anyway

---
 calendar/inc/class.calendar_so.inc.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index a6a51d9cc4..410fb29d2a 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -1536,10 +1536,12 @@ ORDER BY cal_user_type, cal_usre_id
 				$this->db->delete($table, array('cal_id'=>$row['cal_id']), __LINE__, __FILE__, 'calendar');
 			}
 			// handle sync
-			$this->db->query('UPDATE egw_api_content_history
-				SET sync_deleted=NOW()
-				WHERE sync_appname = \'calendar\'
-					AND sync_contentid ='.$row['cal_id'], __LINE__, __FILE__);
+			$this->db->update('egw_api_content_history',array(
+				'sync_deleted' => time(),
+			),array(
+				'sync_appname' => 'calendar',
+				'sync_contentid' => $row['cal_id'],	// sync_contentid is varchar(60)!
+			), __LINE__, __FILE__);
 			// handle links
 			egw_link::unlink('', 'calendar', $row['cal_id']);
 		}

From 7f29cd8530b16c04328a506c86dcb336f1539fdf Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 10 Sep 2010 07:11:22 +0000
Subject: [PATCH 29/47] fix for postgreSQL bug reported by Anthony Messina
 (amessina-at-messinet.com): sync_contentid is varchar(60) and need explicit
 cast: added egw_db->to_int($expr)

---
 calendar/setup/tables_update.inc.php |  2 +-
 phpgwapi/inc/class.egw_db.inc.php    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/calendar/setup/tables_update.inc.php b/calendar/setup/tables_update.inc.php
index 34ac4b0ddb..89d4233786 100644
--- a/calendar/setup/tables_update.inc.php
+++ b/calendar/setup/tables_update.inc.php
@@ -2145,7 +2145,7 @@ function calendar_upgrade1_9_001()
 	),array(
 		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true,'bool').' THEN '.
 			'(SELECT '.$GLOBALS['egw_setup']->db->unix_timestamp('sync_deleted').
-			" FROM egw_api_content_history WHERE sync_appname='calendar' AND sync_contentid=cal_id)".
+			" FROM egw_api_content_history WHERE sync_appname='calendar' AND ".$GLOBALS['egw_setup']->db->to_int('sync_contentid').'=cal_id)'.
 			' ELSE NULL END',
 	));
 
diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index c893bc6419..6211dba358 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -1312,6 +1312,22 @@ class egw_db
 		}
 		return false;
 	}
+	
+	/**
+	 * Cast a column or sql expression to integer, necessary at least for postgreSQL
+	 * 
+	 * @param string $expr
+	 * @return string
+	 */
+	function to_int($expr)
+	{
+		switch($this->Type)
+		{
+			case 'pgsql':
+				return $expr.'::integer';
+		}
+		return $expr;
+	}
 
 	/**
 	* Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements

From 741a12bef2e876f9459264b8ead98e6bbe94c3e9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 10 Sep 2010 08:24:19 +0000
Subject: [PATCH 30/47] fixed typo, wrong parameter name

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

diff --git a/phpgwapi/inc/class.auth_ldap.inc.php b/phpgwapi/inc/class.auth_ldap.inc.php
index fabe93f530..2fcfc66a75 100644
--- a/phpgwapi/inc/class.auth_ldap.inc.php
+++ b/phpgwapi/inc/class.auth_ldap.inc.php
@@ -127,7 +127,7 @@ class auth_ldap implements auth_backend
 			$username = translation::convert($GLOBALS['egw']->accounts->id2name($account_id),
 				translation::charset(),'utf-8');
 		}
-		//echo "<p>auth_ldap::change_password('$old_password','$new_passwd',$account_id) username='$username'</p>\n";
+		//echo "<p>auth_ldap::change_password('$old_passwd','$new_passwd',$account_id) username='$username'</p>\n";
 
 		$filter = $GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)';
 		$filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['egw_info']['user']['domain']),$filter);

From 871e5718afa7b416a422e57d17a956ee6af08aba Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 10 Sep 2010 09:26:17 +0000
Subject: [PATCH 31/47] using one list of auth-types (in order of importance)
 and detecting additional ones in the filesystem

---
 setup/inc/class.setup_cmd_config.inc.php | 49 ++++++++++++++++++++++++
 setup/inc/hook_config.inc.php            | 47 ++++++++++++++++-------
 setup/templates/default/config.tpl       | 31 ++-------------
 3 files changed, 86 insertions(+), 41 deletions(-)

diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php
index d1c41f6304..44b1c87bc2 100644
--- a/setup/inc/class.setup_cmd_config.inc.php
+++ b/setup/inc/class.setup_cmd_config.inc.php
@@ -59,6 +59,9 @@ class setup_cmd_config extends setup_cmd
 
 		$this->check_installed($this->domain,15,$this->verbose);
 
+		// fixing authtypes in self::$options
+		self::auth_types(true);
+		
 		$values = array();
 		if ($this->arguments)	// we have command line arguments
 		{
@@ -317,6 +320,11 @@ class setup_cmd_config extends setup_cmd
 				{
 					if (is_array($data) && isset($data['allowed']))
 					{
+						if ($data['name'] == 'auth_type')
+						{
+							$options[$data['name']] = self::auth_types();
+							continue;
+						}
 						foreach($data['allowed'] as $label => $value)
 						{
 							if (is_int($label))
@@ -331,6 +339,47 @@ class setup_cmd_config extends setup_cmd
 		}
 		return $options;
 	}
+	
+	/**
+	 * Read auth-types (existing auth backends) from filesystem and fix our $options array
+	 * 
+	 * @return array
+	 */
+	static function auth_types()
+	{
+		// default backends in order of importance
+		static $auth_types = array(
+			'sql'  => 'SQL',
+			'ldap' => 'LDAP',
+			'mail' => 'Mail',
+			'ads'  => 'Active Directory',
+			'http' => 'HTTP',
+			'fallback' => 'Fallback LDAP --> SQL',
+			'sqlssl' => 'SQL / SSL',
+		);
+		static $scan_done;
+		if (!$scan_done++)
+		{
+			// now add auth backends found in filesystem
+			foreach(scandir(EGW_INCLUDE_ROOT.'/phpgwapi/inc') as $class)
+			{
+				if (preg_match('/^class\.auth_([a-z]+)\.inc\.php$/',$class,$matches) &&
+					!isset($auth_types[$matches[1]]))
+				{
+					$auth_types[$matches[1]] = ucfirst($matches[1]);
+				}
+			}
+			foreach(self::$options['--account-auth'] as &$param)
+			{
+				if ($param['name'] == 'auth_type')
+				{
+					$param['allowed'] = array_keys($auth_types);
+					break;
+				}
+			}
+		}
+		return $auth_types;
+	}
 
 	/**
 	 * Return the defaults from the $options array
diff --git a/setup/inc/hook_config.inc.php b/setup/inc/hook_config.inc.php
index 4c2321b2b0..fe938cb2aa 100644
--- a/setup/inc/hook_config.inc.php
+++ b/setup/inc/hook_config.inc.php
@@ -239,20 +239,41 @@ function sql_passwdhashes($config)
  */
 function mail_login_type($config)
 {
-	$types = emailadmin_ui::getIMAPLoginTypes('cyrusimap');
-	unset($types['admin']);
-	
-	foreach($types as $value => $label)
+	return _options_from(emailadmin_ui::getIMAPLoginTypes('cyrusimap'),$config['mail_login_type']);
+}
+
+/**
+ * Make auth-types from setup_cmd_config available
+ * 
+ * @param array $config
+ * @return string
+ */
+function auth_type($config)
+{
+	return _options_from(setup_cmd_config::auth_types(),$config['auth_type']);
+}
+function auth_type_syncml($config)
+{
+	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_syncml']);
+}
+function auth_type_groupdav($config)
+{
+	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_groupdav']);
+}
+
+/**
+ * Returns options string
+ * 
+ * @param array $options value => label pairs
+ * @param string $selected value of selected optino
+ * @return string
+ */
+function _options_from(array $options,$selected)
+{
+	foreach($options as $value => $label)
 	{
-		if($config['mail_login_type'] == $value)
-		{
-			$selected = ' selected="selected"';
-		}
-		else
-		{
-			$selected = '';
-		}
-		$out .= '<option value="' . $value . '"' . $selected . '>' . $label . '</option>' . "\n";
+		$out .= '<option value="' . htmlspecialchars($value) . '"' . 
+			($selected == $value ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n";
 	}
 	return $out;
 }
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index 79a3d0835e..5914b4d825 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -213,16 +213,7 @@
     <td>{lang_Select_which_type_of_authentication_you_are_using}:</td>
     <td>
      <select name="newsettings[auth_type]">
-      <option value="sql"{selected_auth_type_sql}>SQL</option>
-      <option value="sqlssl"{selected_auth_type_sqlssl}>SQL / SSL</option>
-      <option value="ldap"{selected_auth_type_ldap}>LDAP</option>
-      <option value="ads"{selected_auth_type_ads}>ADS</option>
-      <option value="mail"{selected_auth_type_mail}>Mail</option>
-      <option value="http"{selected_auth_type_http}>HTTP</option>
-      <option value="nis"{selected_auth_type_nis}>NIS</option>
-      <option value="pam"{selected_auth_type_pam}>PAM</option>
-      <option value="cas"{selected_auth_type_cas}>CAS</option>
-      <option value="fallback"{selected_auth_type_fallback}>Fallback LDAP -> SQL</option>
+{hook_auth_type}
      </select>
     </td>
    </tr>
@@ -232,15 +223,7 @@
     <td>
      <select name="newsettings[auth_type_syncml]">
       <option value="">{lang_Standard,_as_defined_above}</option>
-      <option value="sql"{selected_auth_type_syncml_sql}>SQL</option>
-      <option value="sqlssl"{selected_auth_type_syncml_sqlssl}>SQL / SSL</option>
-      <option value="ldap"{selected_auth_type_syncml_ldap}>LDAP</option>
-      <option value="ads"{selected_auth_type_syncml_ads}>ADS</option>
-      <option value="mail"{selected_auth_type_syncml_mail}>Mail</option>
-      <option value="http"{selected_auth_type_syncml_http}>HTTP</option>
-      <option value="nis"{selected_auth_type_syncml_nis}>NIS</option>
-      <option value="pam"{selected_auth_type_syncml_pam}>PAM</option>
-      <option value="fallback"{selected_auth_type_fallback}>Fallback LDAP -> SQL</option>
+{hook_auth_type_syncml}
      </select>
     </td>
    </tr>
@@ -250,15 +233,7 @@
     <td>
      <select name="newsettings[auth_type_groupdav]">
       <option value="">{lang_Standard,_as_defined_above}</option>
-      <option value="sql"{selected_auth_type_groupdav_sql}>SQL</option>
-      <option value="sqlssl"{selected_auth_type_groupdav_sqlssl}>SQL / SSL</option>
-      <option value="ldap"{selected_auth_type_groupdav_ldap}>LDAP</option>
-      <option value="ads"{selected_auth_type_groupdav_ads}>ADS</option>
-      <option value="mail"{selected_auth_type_groupdav_mail}>Mail</option>
-      <option value="http"{selected_auth_type_groupdav_http}>HTTP</option>
-      <option value="nis"{selected_auth_type_groupdav_nis}>NIS</option>
-      <option value="pam"{selected_auth_type_groupdav_pam}>PAM</option>
-      <option value="fallback"{selected_auth_type_fallback}>Fallback LDAP -> SQL</option>
+{hook_auth_type_groupdav}
      </select>
     </td>
    </tr>

From c5f77ca9826ac6dad866098f9c921876adebc993 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 10 Sep 2010 19:12:59 +0000
Subject: [PATCH 32/47] new param $sql_filter for search()

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

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 9b0a8cd5c9..5982e3d1ce 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -316,14 +316,15 @@ class calendar_bo
 	 *  cols string|array columns to select, if set an iterator will be returned
 	 *  append string to append to the query, eg. GROUP BY
 	 *  cfs array if set, query given custom fields or all for empty array, none are returned, if not set (default)
+	 * @param string $sql_filter=null sql to be and'ed into query (fully quoted), default none
 	 * @return iterator|array|boolean array of events or array with YYYYMMDD strings / array of events pairs (depending on $daywise param)
 	 *	or false if there are no read-grants from _any_ of the requested users or iterator/recordset if cols are given
 	 */
-	function &search($params)
+	function &search($params,$sql_filter=null)
 	{
 		$params_in = $params;
 
-		unset($params['sql_filter']);	// dont allow to set it via UI or xmlrpc
+		$params['sql_filter'] = $sql_filter;	// dont allow to set it via UI or xmlrpc
 
 		// check if any resource wants to hook into
 		foreach($this->resources as $app => $data)

From caf6d694c247a3b9a9342f701dadec3e74c5b900 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 11 Sep 2010 07:47:40 +0000
Subject: [PATCH 33/47] using qstr (quoting of strings) from ADOdb 5.11, it
 might fix problems reported by Anthony Messina

---
 phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php b/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
index 84e944c592..12f8a31935 100644
--- a/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
+++ b/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
@@ -253,25 +253,28 @@ select viewname,'V' from pg_views where viewname like $mask";
 		return $ret;
 	}
 
-	/*
 	// if magic quotes disabled, use pg_escape_string()
 	function qstr($s,$magic_quotes=false)
 	{
+		if (is_bool($s)) return $s ? 'true' : 'false';
+		 
 		if (!$magic_quotes) {
+			if (ADODB_PHPVER >= 0x5200) {
+				return  "'".pg_escape_string($this->_connectionID,$s)."'";
+			} 
 			if (ADODB_PHPVER >= 0x4200) {
 				return  "'".pg_escape_string($s)."'";
 			}
 			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
 			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
 		}
-
+		
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
 		return "'$s'";
 	}
-	*/
 
 
 	// Format date column in sql string given an input format that understands Y M D

From 9f05f4e55155d5b0c07950f401c561e42f4c418e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 11 Sep 2010 08:31:12 +0000
Subject: [PATCH 34/47] removed AFAIK not used file

---
 anon_wrapper.php | 40 ----------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 anon_wrapper.php

diff --git a/anon_wrapper.php b/anon_wrapper.php
deleted file mode 100644
index 0a7afb2ba4..0000000000
--- a/anon_wrapper.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare                                                               *
-	* http://www.egroupware.org                                                *
-	* Written by Dan Kuykendall <seek3r@phpgroupware.org>                      *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-
-	/* $Id$ */
-
-	// TODO:
-	// Limit which users can access this program (ACL check)
-	// Global disabler
-	// Detect bad logins and passwords, spit out generic message
-
-	// If your are going to use multiable accounts, remove the following lines
-	$login  = 'anonymous';
-	$passwd = 'anonymous';
-
-	$GLOBALS['egw_info']['flags'] = array(
-		'disable_Template_class' => True,
-		'login' => True,
-		'currentapp' => 'login',
-		'noheader'  => True
-	);
-	include('./header.inc.php');
-
-	// If your are going to use multiable accounts, remove the following lines 
-	// You must create the useraccount and check its permissions before use 
-
-	$login  = 'anonymous'; 
-	$passwd = 'anonymous'; 
-
-	$sessionid = $GLOBALS['egw']->session->create($login,$passwd,'text');
-	$GLOBALS['egw']->redirect($GLOBALS['egw']->link('/index.php'));
-?>

From 07063ebf7aac9f19c55ae58183eb0cc1d61c48b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 11 Sep 2010 18:08:48 +0000
Subject: [PATCH 35/47] Update cal_modified for all required cases; adjust
 CalDAV ctag function

---
 calendar/inc/class.calendar_boupdate.inc.php | 32 ++++++++++++-----
 calendar/inc/class.calendar_groupdav.inc.php | 38 ++++++++++++++++++--
 calendar/inc/class.calendar_so.inc.php       | 15 ++++++++
 3 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 4d057d0e3d..8f01597d3a 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -143,7 +143,7 @@ class calendar_boupdate extends calendar_bo
 		if ($new_event)
 		{
 			$event['created'] = $this->now_su;
-			$event['creator'] = $GLOBALS['egw_info']['user']['account_id'];
+			$event['creator'] = $this->user;
 			$old_event = array();
 		}
 		else
@@ -339,7 +339,7 @@ class calendar_boupdate extends calendar_bo
 		if ($touch_modified)
 		{
 			$event['modified'] = $this->now_su;	// we are still in user-time
-			$event['modifier'] = $GLOBALS['egw_info']['user']['account_id'];
+			$event['modifier'] = $this->user;
 		}
 		//echo "saving $event[id]="; _debug_array($event);
 		$event2save = $event;
@@ -927,6 +927,16 @@ class calendar_boupdate extends calendar_bo
 				$event['alarm'][$id]['time'] = $this->date2ts($alarm['time'],true);
 			}
 		}
+		if (!isset($event['modified']))
+		{
+			$event['modified'] = $this->now;
+			$event['modifier'] = $this->user;
+		}
+		if (empty($event['id']) && !isset($event['created']))
+		{
+			$event['created'] = $this->now;
+			$event['creator'] = $this->user;
+		}
 		$set_recurrences = false;
 		$set_recurrences_start = 0;
 		if (($cal_id = $this->so->save($event,$set_recurrences,$set_recurrences_start,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
@@ -936,7 +946,7 @@ class calendar_boupdate extends calendar_bo
 			unset($save_event['participants']);
 			$this->set_recurrences($save_event, $set_recurrences_start);
 		}
-		if ($updateTS) $GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,$event['id'] ? 'modify' : 'add',time());
+		if ($updateTS) $GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, $event['id'] ? 'modify' : 'add', $this->now);
 
 		// Update history
 		$tracking = new calendar_tracking($this);
@@ -1138,8 +1148,12 @@ class calendar_boupdate extends calendar_bo
 				is_numeric($uid)?$uid:substr($uid,1),$status,
 				$recur_date?$this->date2ts($recur_date,true):0,$role)))
 		{
-			if ($updateTS) $GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,'modify',time());
-
+			if ($updateTS)
+			{
+				$GLOBALS['egw']->content ->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
+				$this->so->updateModified($cal_id, $this->now, $this->user);
+			}
+			
 			static $status2msg = array(
 				'R' => MSG_REJECTED,
 				'T' => MSG_TENTATIVE,
@@ -1238,7 +1252,7 @@ class calendar_boupdate extends calendar_bo
 					}
 				}
 			}
-			$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id,'delete',time());
+			$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'delete', $this->now);
 		}
 		else
 		{
@@ -1446,7 +1460,8 @@ class calendar_boupdate extends calendar_bo
 		}
 		$alarm['time'] = $this->date2ts($alarm['time'],true);	// user to server-time
 
-		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id, 'modify', time());
+		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
+		$this->so->updateModified($cal_id, $this->now, $this->user);
 
 		return $this->so->save_alarm($cal_id,$alarm, $this->now);
 	}
@@ -1466,7 +1481,8 @@ class calendar_boupdate extends calendar_bo
 			return false;	// no rights to delete the alarm
 		}
 
-		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar',$cal_id, 'modify', time());
+		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
+		$this->so->updateModified($cal_id, $this->now, $this->user);
 
 		return $this->so->delete_alarm($id, $this->now);
 	}
diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index e4da86a4ff..f2c46a5904 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -107,8 +107,8 @@ class calendar_groupdav extends groupdav_handler
 		// ToDo: add parameter to only return id & etag
 		$filter = array(
 			'users' => $user,
-			'start' => time()-100*24*3600,	// default one month back -30 breaks all sync recurrences
-			'end' => time()+365*24*3600,	// default one year into the future +365
+			'start' => $this->bo->now - 100*24*3600,	// default one month back -30 breaks all sync recurrences
+			'end' => $this->bo->now + 365*24*3600,	// default one year into the future +365
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
@@ -756,7 +756,39 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 	 */
 	public function getctag($path,$user)
 	{
-		$ctag = $GLOBALS['egw']->contenthistory->getLastChange('calendar');
+		$filter = array(
+			'users' => $user,
+			'start' => $this->bo->now - 100*24*3600,	// default one month back -30 breaks all sync recurrences
+			'end' => $this->bo->now + 365*24*3600,	// default one year into the future +365
+			'enum_recuring' => false,
+			'daywise' => false,
+			'date_format' => 'server',
+			'cols'		=> array('cal_modified'),
+			'order'     => 'cal_modified DESC',
+			'num_rows'	=> 1,
+		);
+		
+		if ($path == '/calendar/')
+		{
+			$filter['filter'] = 'owner';
+		}
+		else
+		{
+			$filter['filter'] = 'default'; // not rejected
+		}
+		
+		if (($events =& $this->bo->search($filter)))
+		{
+			foreach ($events as $event)
+			{
+				$ctag = $event['cal_modified'];
+				break;
+			}
+		}
+		else
+		{
+			$ctag = '0';
+		}
 
 		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
 		
diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 410fb29d2a..38ec4eb68d 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -2190,4 +2190,19 @@ ORDER BY cal_user_type, cal_usre_id
 		}
 		return new egw_time($time->format('Y-m-d 00:00:00'), $timezone);
 	}
+	
+	/**
+	 * Udates the modification timestamp 
+	 *
+	 * @param id		event id
+	 * @param time		new timestamp
+	 * @param modifier	uid of the modifier
+	 * 
+	 */
+	function updateModified($id, $time, $modifier)
+	{
+		$this->db->update($this->cal_table,
+			array('cal_modified' => $time, 'cal_modifier' => $modifier),
+			array('cal_id' => $id), __LINE__,__FILE__, 'calendar');
+	}
 }

From 13cf31924f772f332859365f432b5d0483135535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sat, 11 Sep 2010 23:15:05 +0000
Subject: [PATCH 36/47] Fix find_event() issue

---
 calendar/inc/class.calendar_boupdate.inc.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 8f01597d3a..27412bbf86 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1241,7 +1241,7 @@ class calendar_boupdate extends calendar_bo
 			}
 			elseif ($config['calendar_delete_history'])
 			{
-				$event['deleted'] = time();
+				$event['deleted'] = $this->now;
 				$this->save($event, $ignore_acl);
 				// Actually delete alarms
 				if (isset($event['alarm']) && is_array($event['alarm']))
@@ -1592,14 +1592,20 @@ class calendar_boupdate extends calendar_bo
 				"($filter)[EVENT]:" . array2string($event)."\n",3,$this->logfile);
 		}
 
+		if (!isset($event['recurrence'])) $event['recurrence'] = 0;
+		
 		if ($filter == 'master')
 		{
 			$query[] = 'recur_type!='. MCAL_RECUR_NONE;
 			$query['cal_recurrence'] = 0;
 		}
+		else
+		{
+			$query[] = 'recur_type='.$event['recur_type'];
+			$query['cal_recurrence'] = $event['recurrence'];	
+		}
 
-		if (!isset($event['recurrence'])) $event['recurrence'] = 0;
-
+		
 		if ($event['id'])
 		{
 			if ($this->log)
@@ -1723,7 +1729,6 @@ class calendar_boupdate extends calendar_bo
 			}
 			elseif (isset($event['start']))
 			{
-
 				if ($filter == 'relax')
 				{
 					$query[] = ('cal_start>' . ($event['start'] - 3600));
@@ -1744,12 +1749,12 @@ class calendar_boupdate extends calendar_bo
 			{
 				$matchFields = array('priority', 'public');
 			}
-			$matchFields[] = 'recurrence';
 			foreach ($matchFields as $key)
 			{
 				if (isset($event[$key])) $query['cal_'.$key] = $event[$key];
 			}
 		}
+
 		if (!empty($event['uid']))
 		{
 			$query['cal_uid'] = $event['uid'];

From da41f40507d268e5fd5cf774535da836003e3fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sun, 12 Sep 2010 12:34:32 +0000
Subject: [PATCH 37/47] Allow the check only readable items in content history

---
 phpgwapi/inc/class.contenthistory.inc.php | 37 ++++++++++++++++-------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/phpgwapi/inc/class.contenthistory.inc.php b/phpgwapi/inc/class.contenthistory.inc.php
index 61b373202c..28e45ba1de 100644
--- a/phpgwapi/inc/class.contenthistory.inc.php
+++ b/phpgwapi/inc/class.contenthistory.inc.php
@@ -58,31 +58,48 @@ class contenthistory
 	 * @param string$_appName the appname example: infolog_notes
 	 * @param string $_action can be modify, add or delete
 	 * @param string $_ts timestamp where to start searching from
+	 * @param array $readableItems	(optional) readable items of current user
 	 * @return array containing contentIds with changes
 	 */
-	function getHistory($_appName, $_action, $_ts)
+	function getHistory($_appName, $_action, $_ts, $readableItems = false)
 	{
 		$where = array('sync_appname' => $_appName);
-
+		$ts = $this->db->to_timestamp($_ts);
+		$idList = array();
+		
 		switch($_action)
 		{
 			case 'modify':
-				$where[] = "sync_modified > '".$this->db->to_timestamp($_ts)."' AND sync_deleted IS NULL";
+				$where[] = "sync_modified > '".$ts."' AND sync_deleted IS NULL";
 				break;
 			case 'delete':
-				$where[] = "sync_deleted > '".$this->db->to_timestamp($_ts)."'";
+				$where[] = "sync_deleted > '".$ts."'";
 				break;
 			case 'add':
-				$where[] = "sync_added > '".$this->db->to_timestamp($_ts)."' AND sync_deleted IS NULL AND sync_modified IS NULL";
+				$where[] = "sync_added > '".$ts."' AND sync_deleted IS NULL AND sync_modified IS NULL";
 				break;
 			default:
 				// no valid $_action set
 				return array();
 		}
-		$idList = array();
-		foreach($this->db->select(self::TABLE,'sync_contentid',$where,__LINE__,__FILE__) as $row)
+		
+		if (is_array($readableItems))
 		{
-			$idList[] = $row['sync_contentid'];
+			foreach ($readableItems as $id)
+			{
+				$where['sync_contentid'] = $id;
+				if (!$this->db->select(self::TABLE,'sync_contentid',$where,__LINE__,__FILE__))
+				{
+					$idList[] = $id;
+				}	
+			}
+		}
+		else
+		{
+			foreach ($this->db->select(self::TABLE,'sync_contentid',$where,__LINE__,__FILE__) as $row)
+			{
+				$idList[] = $row['sync_contentid'];
+			}
 		}
 
 		return $idList;
@@ -116,6 +133,7 @@ class contenthistory
 			'sync_contentid' => $_id,
 		);
 
+		$ts = false;
 		if (($ts = $this->db->select(self::TABLE,$col,$where,__LINE__,__FILE__)->fetchColumn()))
 		{
 			$ts = $this->db->from_timestamp($ts);
@@ -165,9 +183,6 @@ class contenthistory
 					'sync_changedby'	=> $GLOBALS['egw_info']['user']['account_id'],
 					$_action == 'delete' ? 'sync_deleted' : 'sync_modified' => $this->db->to_timestamp($_ts),
 				);
-				// if deleted entry get's modified, removed deleted timestamp, as it got recovered
-				if ($_action == 'modify') $newData['sync_deleted'] = null;
-				
 				$this->db->update(self::TABLE, $newData, $where,__LINE__,__FILE__);
 				break;
 		}

From 5e161094e74d78a358a5dd405d562931600fff8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sun, 12 Sep 2010 12:36:40 +0000
Subject: [PATCH 38/47] Allow to check only readable items in content history

---
 phpgwapi/inc/horde/Horde/SyncML/State_egw.php | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
index 1297b53491..787c791724 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
@@ -77,12 +77,26 @@ class EGW_SyncML_State extends Horde_SyncML_State
 	 * @param string$_appName the appname example: infolog_notes
 	 * @param string $_action can be modify, add or delete
 	 * @param string $_ts timestamp where to start searching from
+	 * @param array $readableItems	(optional) readable items of current user
 	 * @return array containing syncIDs with changes
 	 */
-	function getHistory($_appName, $_action, $_ts) {
-		$guidList = array ();
-		$syncIdList = array ();
-		$idList = $GLOBALS['egw']->contenthistory->getHistory($_appName, $_action, $_ts);
+	function getHistory($_appName, $_action, $_ts, $readableItems = false) {
+		$guidList = array();
+		$syncIdList = array();
+		$userItems = false;
+		if (is_array($readableItems))
+		{
+			$userItems = array();
+			foreach($readableItems as $guid)
+			{
+				if (preg_match('/'.$_appName.'-(\d+)$/', $guid, $matches))
+				{
+					// We use only the real items' ids
+					$userItems[] = $matches[1];
+				}
+			}
+		}
+		$idList = $GLOBALS['egw']->contenthistory->getHistory($_appName, $_action, $_ts, $userItems);
 		foreach ($idList as $idItem)
 		{
 			if ($idItem) // ignore inconsistent entries
@@ -244,7 +258,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
 		), __LINE__, __FILE__, false, '', 'syncml') as $row) {
 			$guids[] = $row['map_guid'];
 		}
-		return $guids ? $guids : false;
+		return $guids;
 	}
 
 	/**

From 6fde93d15bba3bc0fd950b08de9f94d63fad16fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sun, 12 Sep 2010 12:44:22 +0000
Subject: [PATCH 39/47] Improved ctag for CalDAV

---
 calendar/inc/class.calendar_groupdav.inc.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index f2c46a5904..f063b69da1 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -763,9 +763,7 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
-			'cols'		=> array('cal_modified'),
-			'order'     => 'cal_modified DESC',
-			'num_rows'	=> 1,
+			'cols'		=> array('egw_cal.cal_id', 'cal_start', 'cal_modified'),
 		);
 		
 		if ($path == '/calendar/')
@@ -777,18 +775,17 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 			$filter['filter'] = 'default'; // not rejected
 		}
 		
+		$ctag = 0;
+		
 		if (($events =& $this->bo->search($filter)))
 		{
 			foreach ($events as $event)
 			{
-				$ctag = $event['cal_modified'];
+				$modified = max($this->bo->so->max_user_modified($event['cal_id']), $event['cal_modified']);
+				if ($ctag < $modified) $ctag = $modified;
 				break;
 			}
 		}
-		else
-		{
-			$ctag = '0';
-		}
 
 		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
 		

From bb9190a669b29d9ace46698777c15ca541430133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sun, 12 Sep 2010 20:14:46 +0000
Subject: [PATCH 40/47] New content_history approach for calendar
 synchronization; fix various Sync issues

---
 calendar/inc/class.calendar_boupdate.inc.php  | 43 ++++++++++++-------
 phpgwapi/inc/class.contenthistory.inc.php     |  1 -
 phpgwapi/inc/horde/Horde/SyncML/State_egw.php | 11 +++--
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 27412bbf86..ec67567ea4 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -927,12 +927,12 @@ class calendar_boupdate extends calendar_bo
 				$event['alarm'][$id]['time'] = $this->date2ts($alarm['time'],true);
 			}
 		}
-		if (!isset($event['modified']))
+		if (!isset($event['modified']) || $event['modified'] > $this->now)
 		{
 			$event['modified'] = $this->now;
 			$event['modifier'] = $this->user;
 		}
-		if (empty($event['id']) && !isset($event['created']))
+		if (empty($event['id']) && (!isset($event['created']) || $event['created'] > $this->now))
 		{
 			$event['created'] = $this->now;
 			$event['creator'] = $this->user;
@@ -1150,8 +1150,8 @@ class calendar_boupdate extends calendar_bo
 		{
 			if ($updateTS)
 			{
-				$GLOBALS['egw']->content ->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
-				$this->so->updateModified($cal_id, $this->now, $this->user);
+				$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
+				//$this->so->updateModified($cal_id, $this->now, $this->user);
 			}
 			
 			static $status2msg = array(
@@ -1461,7 +1461,7 @@ class calendar_boupdate extends calendar_bo
 		$alarm['time'] = $this->date2ts($alarm['time'],true);	// user to server-time
 
 		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
-		$this->so->updateModified($cal_id, $this->now, $this->user);
+		//$this->so->updateModified($cal_id, $this->now, $this->user);
 
 		return $this->so->save_alarm($cal_id,$alarm, $this->now);
 	}
@@ -1482,7 +1482,7 @@ class calendar_boupdate extends calendar_bo
 		}
 
 		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
-		$this->so->updateModified($cal_id, $this->now, $this->user);
+		//$this->so->updateModified($cal_id, $this->now, $this->user);
 
 		return $this->so->delete_alarm($id, $this->now);
 	}
@@ -1599,12 +1599,18 @@ class calendar_boupdate extends calendar_bo
 			$query[] = 'recur_type!='. MCAL_RECUR_NONE;
 			$query['cal_recurrence'] = 0;
 		}
-		else
+		elseif ($filter == 'exact')
 		{
-			$query[] = 'recur_type='.$event['recur_type'];
+			if ($event['recur_type'] != MCAL_RECUR_NONE)
+			{
+				$query[] = 'recur_type='.$event['recur_type'];
+			}
+			else
+			{
+				$query[] = 'recur_type IS NULL';
+			}
 			$query['cal_recurrence'] = $event['recurrence'];	
 		}
-
 		
 		if ($event['id'])
 		{
@@ -1973,8 +1979,15 @@ class calendar_boupdate extends calendar_bo
 							unset($egwEvent['participants'][$attendee]);
 						}
 					}
-					// ORGANIZER is maybe missing
+					// ORGANIZER and Groups may be missing
 					unset($egwEvent['participants'][$egwEvent['owner']]);
+					foreach ($egwEvent['participants'] as $attendee => $status)
+					{
+						if (is_numeric($attendee) && $attendee < 0)
+						{
+							unset($egwEvent['participants'][$attendee]);
+						}
+					}
 					if (!empty($egwEvent['participants']))
 					{
 						if ($this->log)
@@ -2026,7 +2039,7 @@ class calendar_boupdate extends calendar_bo
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								'() missing event[recur_exception]: ' .
-								array2string($event['recur_exception']));
+								array2string($event['recur_exception'])."\n",3,$this->logfile);
 						}
 						continue;
 					}
@@ -2050,12 +2063,10 @@ class calendar_boupdate extends calendar_bo
 			}
 			$matchingEvents[] = $egwEvent['id']; // exact match
 		}
-		if (!empty($event['uid']) &&
-			count($matchingEvents) > 1 || $filter != 'master' &&
-			$egwEvent['recur_type'] != MCAL_RECUR_NONE &&
-			empty($event['recur_type']))
+		
+		if ($filter == 'exact' && !empty($event['uid']) && count($matchingEvents) > 1
+			|| $filter != 'master' && !empty($egwEvent['recur_type']) && empty($event['recur_type']))
 		{
-			
 			// Unknown exception for existing series
 			if ($this->log)
 			{
diff --git a/phpgwapi/inc/class.contenthistory.inc.php b/phpgwapi/inc/class.contenthistory.inc.php
index 28e45ba1de..1f10a03069 100644
--- a/phpgwapi/inc/class.contenthistory.inc.php
+++ b/phpgwapi/inc/class.contenthistory.inc.php
@@ -133,7 +133,6 @@ class contenthistory
 			'sync_contentid' => $_id,
 		);
 
-		$ts = false;
 		if (($ts = $this->db->select(self::TABLE,$col,$where,__LINE__,__FILE__)->fetchColumn()))
 		{
 			$ts = $this->db->from_timestamp($ts);
diff --git a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
index 787c791724..5e07a73fdf 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State_egw.php
@@ -89,12 +89,13 @@ class EGW_SyncML_State extends Horde_SyncML_State
 			$userItems = array();
 			foreach($readableItems as $guid)
 			{
-				if (preg_match('/'.$_appName.'-(\d+)$/', $guid, $matches))
+				if (preg_match('/'.$_appName.'-(\d+)(:(\d+))?/', $guid, $matches))
 				{
 					// We use only the real items' ids
 					$userItems[] = $matches[1];
 				}
 			}
+			$userItems = array_unique($userItems);
 		}
 		$idList = $GLOBALS['egw']->contenthistory->getHistory($_appName, $_action, $_ts, $userItems);
 		foreach ($idList as $idItem)
@@ -603,14 +604,18 @@ class EGW_SyncML_State extends Horde_SyncML_State
 		$GLOBALS['egw']->db->delete('egw_contentmap', $where,
 			__LINE__, __FILE__, 'syncml');
 
-		// delete all EGw id's
+		// expire old EGw id's
 		$where = array(
 			'map_id'	=> $mapID,
 			'map_guid'	=> $guid,
 		);
 		$GLOBALS['egw']->db->delete('egw_contentmap', $where,
 			__LINE__, __FILE__, 'syncml');
-
+		/*	
+		$data = array ('map_expired' => true);
+		$GLOBALS['egw']->db->update('egw_contentmap', $data, $where,
+			__LINE__, __FILE__, 'syncml');
+		*/
 		$data = $where + array(
 			'map_locuid'	=> $locid,
 			'map_timestamp'	=> $ts,

From b02f8301282c66461fc7e66462ab1a70eb29911f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sun, 12 Sep 2010 21:16:39 +0000
Subject: [PATCH 41/47] Fix content history issue

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

diff --git a/phpgwapi/inc/class.contenthistory.inc.php b/phpgwapi/inc/class.contenthistory.inc.php
index 1f10a03069..0a85641282 100644
--- a/phpgwapi/inc/class.contenthistory.inc.php
+++ b/phpgwapi/inc/class.contenthistory.inc.php
@@ -88,7 +88,7 @@ class contenthistory
 			foreach ($readableItems as $id)
 			{
 				$where['sync_contentid'] = $id;
-				if (!$this->db->select(self::TABLE,'sync_contentid',$where,__LINE__,__FILE__))
+				if ($this->db->select(self::TABLE,'sync_contentid',$where,__LINE__,__FILE__)->fetchColumn())
 				{
 					$idList[] = $id;
 				}	

From 553152fc8086d6ca507693b8a4a3bf24f52504d6 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 13 Sep 2010 08:41:04 +0000
Subject: [PATCH 42/47] fix for expected parameter for data must be an array in
 set_timer, when starting async testjob; handling array as adr in send when
 creating messages

---
 admin/inc/class.uiasyncservice.inc.php | 2 +-
 phpgwapi/inc/class.send.inc.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/inc/class.uiasyncservice.inc.php b/admin/inc/class.uiasyncservice.inc.php
index 40a206fd8e..6cbdf38d11 100644
--- a/admin/inc/class.uiasyncservice.inc.php
+++ b/admin/inc/class.uiasyncservice.inc.php
@@ -59,7 +59,7 @@ class uiasyncservice
 				{
 					echo '<p><b>'.lang("You have no email address for your user set !!!")."</b></p>\n";
 				}
-				elseif (!$async->set_timer($times,'test','admin.uiasyncservice.test',$GLOBALS['egw_info']['user']['email']))
+				elseif (!$async->set_timer($times,'test','admin.uiasyncservice.test',(array)$GLOBALS['egw_info']['user']['email']))
 				{
 					echo '<p><b>'.lang("Error setting timer, wrong syntax or maybe there's one already running !!!")."</b></p>\n";
 				}
diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index 682469e9b2..8f4d38544e 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -213,14 +213,14 @@
 			{
 				if ($$adr)
 				{
-					if (preg_match_all('/"?(.+)"?<(.+)>,?/',$$adr,$matches))
+					if (is_string($$adr) && preg_match_all('/"?(.+)"?<(.+)>,?/',$$adr,$matches))
 					{
 						$names = $matches[1];
 						$addresses = $matches[2];
 					}
 					else
 					{
-						$addresses = explode(',',trim($$adr));
+						$addresses = (is_string($$adr) ? explode(',',trim($$adr)) : explode(',',trim($$adr[0])));
 						$names = array();
 					}
 					$method = 'Add'.($adr == 'to' ? 'Address' : $adr);

From 9ae3b93e63a5259740417e9045d00b20978b7ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Tue, 14 Sep 2010 05:07:33 +0000
Subject: [PATCH 43/47] Fix CalDAV ctag calculation

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

diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index f063b69da1..743b265352 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -783,7 +783,6 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 			{
 				$modified = max($this->bo->so->max_user_modified($event['cal_id']), $event['cal_modified']);
 				if ($ctag < $modified) $ctag = $modified;
-				break;
 			}
 		}
 

From 34e51b19e89fbf3124e0e31e0eaf12be0117b041 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 14 Sep 2010 09:38:59 +0000
Subject: [PATCH 44/47] reverting back to arbitrary job data AND adding other
 job parameters only if data is an array, it made to many problems requiring
 it to be an array

---
 phpgwapi/inc/class.asyncservice.inc.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/inc/class.asyncservice.inc.php b/phpgwapi/inc/class.asyncservice.inc.php
index a83ba74f61..43331db4c7 100644
--- a/phpgwapi/inc/class.asyncservice.inc.php
+++ b/phpgwapi/inc/class.asyncservice.inc.php
@@ -65,13 +65,13 @@ class asyncservice
 	 * 	eg. '<app><id>X' where id is the internal id of app and X might indicate the action.
 	 * @param string $method Method to be called via ExecMethod($method,$data). $method has the form
 	 * 	'<app>.<class>.<public function>'.
-	 * @param array $data=null This data is passed back when the method is called. EGroupware adds the
-	 *                          rest of the job parameters like id, next (sheduled exec time), times, ...
+	 * @param mixed $data=null This data is passed back when the method is called. If it is an array,
+	 * 	EGroupware will add the rest of the job parameters like id, next (sheduled exec time), times, ...
 	 * @param int $account_id account_id, under which the methode should be called or False for the actual user
 	 * @param boolean $debug=false
 	 * @return boolean False if $id already exists, else True
 	 */
-	function set_timer($times,$id,$method,array $data=null,$account_id=False,$debug=false)
+	function set_timer($times,$id,$method,$data=null,$account_id=False,$debug=false)
 	{
 		if (empty($id) || empty($method) || $this->read($id) ||
 				!($next = $this->next_run($times,$debug)))
@@ -426,7 +426,11 @@ class asyncservice
 				list($app) = strpos($job['method'],'::') !== false ? explode('_',$job['method']) :
 					explode('.',$job['method']);
 				translation::add_app($app);
-				ExecMethod($job['method'],(array)$job['data']+array_diff_key($job,array('data' => false)));
+				if (is_array($job['data']))
+				{
+					$job['data'] += array_diff_key($job,array('data' => false));
+				}
+				ExecMethod($job['method'],$job['data']);
 
 				// re-read job, in case it had been updated or even deleted in the method
 				$updated = $this->read($id);

From 201f0d33e39b810626e98243d5bf7107e0e4312e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 14 Sep 2010 16:33:33 +0000
Subject: [PATCH 45/47] also quote quotes in variables surounded by curly
 brackets, eg. '{[nm][path]}'

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

diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 01deb420c1..d439774f4b 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -178,8 +178,9 @@ class boetemplate extends soetemplate
 			$col_row_cont = $cont[$col.$row];
 
 			// check if name is enclosed in single quotes as argument eg. to an event handler or
+			// variable name is contained in quotes and curly brackets, eg. "'{$cont[nm][path]}'" or
 			// used as name for a button like "delete[$row_cont[something]]" --> quote contained quotes (' or ")
-			if (in_array($name[$pos_var-1],array('[',"'")) && preg_match('/[\'\[]('.self::PHP_VAR_PREG.')[\'\]]+/',$name,$matches))
+			if (in_array($name[$pos_var-1],array('[',"'",'{')) && preg_match('/[\'\[]{?('.self::PHP_VAR_PREG.')}?[\'\]]+/',$name,$matches))
 			{
 				eval('$value = '.$matches[1].';');
 				if (is_array($value) && $name[$pos_var-1] == "'")	// arrays are only supported for '
@@ -194,7 +195,7 @@ class boetemplate extends soetemplate
 				else
 				{
 					$value = str_replace(array("'",'"'),array('\\\'','&quot;'),$value);
-					$name = str_replace($matches[1],$value,$name);
+					$name = str_replace(array('{'.$matches[1].'}',$matches[1]),$value,$name);
 				}
 			}
 			// check if name is assigned in an url --> urlendcode contained & as %26, as egw::link explodes it on &

From f263ccccb13a5d511862919fcd7295f4856d5aaa Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 14 Sep 2010 17:03:12 +0000
Subject: [PATCH 46/47] - disabling of delete and mail icon did not work for
 files/folders with quotes in the name - mail icon was not disabled, if user
 has no run rights for FMail

---
 filemanager/inc/class.filemanager_ui.inc.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 0796fcf176..16f9bdec02 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -646,13 +646,15 @@ class filemanager_ui
 			{
 				$dir_is_writable[$dir] = egw_vfs::is_writable($dir);
 			}
+			$path_quoted = str_replace(array('"',"'"),array('&quot;',"\\'"),$path);
 			if (!$dir_is_writable[$dir])
 			{
-				$readonlys["delete[$path]"] = true;	// no rights to delete the file
+				$readonlys["delete[$path_quoted]"] = true;	// no rights to delete the file
 			}
-			if (egw_vfs::is_dir($path) || !egw_vfs::is_readable($path))
+			if (egw_vfs::is_dir($path) || !egw_vfs::is_readable($path) || 
+				!$GLOBALS['egw_info']['user']['apps']['felamimail'])
 			{
-				$readonlys["mail[$path]"] = true;
+				$readonlys["mail[$path_quoted]"] = true;
 			}
 		}
 		// query comments and cf's for the displayed rows

From 3b46acda8f30075791a3656bd623815fe8c4fde6 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 14 Sep 2010 21:17:29 +0000
Subject: [PATCH 47/47] Fixes to get selectboxes working for IE (Stylite #8186)

---
 .../inc/class.importexport_export_ui.inc.php        | 12 ++++++------
 .../inc/class.importexport_import_ui.inc.php        |  7 ++++---
 .../inc/class.importexport_schedule_ui.inc.php      | 12 +++++++-----
 ...ass.importexport_wizard_basic_import_csv.inc.php |  2 +-
 importexport/js/importexport.js                     | 13 +++++++++++++
 5 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 importexport/js/importexport.js

diff --git a/importexport/inc/class.importexport_export_ui.inc.php b/importexport/inc/class.importexport_export_ui.inc.php
index b26a8ecfec..d06de90df0 100644
--- a/importexport/inc/class.importexport_export_ui.inc.php
+++ b/importexport/inc/class.importexport_export_ui.inc.php
@@ -35,6 +35,7 @@ class importexport_export_ui {
 	public function __construct() {
 		$this->js = $GLOBALS['egw']->js = is_object($GLOBALS['egw']->js) ? $GLOBALS['egw']->js : CreateObject('phpgwapi.javascript');
 		$this->js->validate_file('.','export_dialog','importexport');
+		$this->js->validate_file('.','importexport','importexport');
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
 		$this->export_plugins = importexport_helper_functions::get_plugins('all','export');
 		$GLOBALS['egw_info']['flags']['include_xajax'] = true;
@@ -278,24 +279,23 @@ class importexport_export_ui {
 			'type' => 'export',
 			'application' => $_appname
 		));
+		$response->addScript("clear_options('exec[definition]');");
 		foreach ((array)$definitions->get_definitions() as $identifier) {
 				$definition = new importexport_definition($identifier);
 				if ($title = $definition->get_title()) {
 					if (!$selected_plugin) $selected_plugin = $title;
-					$sel_options['definition'] .= '<option ' . ($selected_plugin == $title ? 'selected="selected" ' : '') .
-						'value="'. $title. '" >'. $title. '</option>';
+					$response->addScript("selectbox_add_option('exec[definition]','$title', '$value',$selected_plugin == $title);");
 				}
 				unset($definition);
 		}
 		unset($definitions);
-		$sel_options['definition'] .= '<option value="expert">' . lang('Expert options') . '</option';
+		$response->addScript("selectbox_add_option('exec[definition]','" . lang('Expert options') . "', 'expert',$selected_plugin == $title);");
 		
 		if($selected_plugin == 'expert') {
 			$this->ajax_get_plugins($_appname, $response);
 		} else {
 			$response->addScript("set_style_by_class('tr','select_plugin','display','none');");
 		}
-		$response->addAssign('exec[definition]','innerHTML',$sel_options['definition']);
 		$response->addScript('export_dialog.change_definition(document.getElementById("exec[definition]"));');
 		$response->addScript("set_style_by_class('tr','select_definition','display','table-row');");
 		return $no_return ? '' : $response->getXML();
@@ -314,15 +314,15 @@ class importexport_export_ui {
 		
 		(array)$plugins = importexport_helper_functions::get_plugins($_appname,'export');
 		$sel_options['plugin'] = '';
+		$response->addScript("clear_options('exec[plugin]');");
 		foreach ($plugins[$_appname]['export'] as $plugin => $plugin_name) {
 			if (!$selected_plugin) $selected_plugin = $plugin;
-			$sel_options['plugin'] .= '<option value="'. $plugin. '" >'. $plugin_name. '</option>';
+			$response->addScript("selectbox_add_option('exec[plugin]','$plugin_name', '$plugin',$selected_plugin == $plugin);");
 		}
 		
 		$this->ajax_get_plugin_description($selected_plugin,$response);
 		$this->ajax_get_plugin_options($selected_plugin, $response, $_definition);
 		$this->ajax_get_plugin_selectors($selected_plugin, $response, $_definition);
-		$response->addAssign('exec[plugin]','innerHTML',$sel_options['plugin']);
 		$response->addScript("set_style_by_class('tr','select_plugin','display','table-row');");
 		return $no_return ? '' : $response->getXML();
 	}
diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php
index 92018c529c..4c2c30d144 100644
--- a/importexport/inc/class.importexport_import_ui.inc.php
+++ b/importexport/inc/class.importexport_import_ui.inc.php
@@ -78,6 +78,7 @@
 			$sel_options = self::get_select_options($data);
 
 			$data['message'] = $this->message;
+			$GLOBALS['egw']->js->validate_file('.','importexport','importexport');
 
 			$template = new etemplate('importexport.import_dialog');
 			$template->exec('importexport.importexport_import_ui.import_dialog', $data, $sel_options, $readonlys, $preserve, 2);
@@ -120,13 +121,13 @@
 		*/
 		public function ajax_get_definitions($appname, $file=null) {
 			$options = self::get_select_options(array('appname'=>$appname, 'file'=>$file));
+			$response = new xajaxResponse();
+			$response->addScript("clear_options('exec[definition]');");
 			if(is_array($options['definition'])) {
 				foreach ($options['definition'] as $value => $title) {
-					$sel_options['definition'] .= '<option value="'. $value. '" >'. $title. '</option>';
+					$response->addScript("selectbox_add_option('exec[definition]','$title', '$value',false);");
 				}
 			}
-			$response = new xajaxResponse();
-			$response->addAssign('exec[definition]','innerHTML',$sel_options['definition']);
 			return $response->getXML();
 		}
 	}
diff --git a/importexport/inc/class.importexport_schedule_ui.inc.php b/importexport/inc/class.importexport_schedule_ui.inc.php
index b74e711313..27bff10230 100644
--- a/importexport/inc/class.importexport_schedule_ui.inc.php
+++ b/importexport/inc/class.importexport_schedule_ui.inc.php
@@ -111,6 +111,7 @@
 			}
 
 			$sel_options = self::get_select_options($data);
+			$GLOBALS['egw']->js->validate_file('.','importexport','importexport');
 
 			$GLOBALS['egw_info']['flags']['app_header'] = lang('Schedule import / export');
 			$this->template->read('importexport.schedule_edit');
@@ -203,8 +204,9 @@
 				$response = new xajaxResponse();
 			}
 			$options = self::get_select_options(array('type' => $type, 'appname'=>$appname));
-			if(is_array($options['plugins'])) {
-				foreach ($options['plugins'] as $value => $title) {
+			$response->addScript("clear_options('exec[plugin]');");
+			if(is_array($options['plugin'])) {
+				foreach ($options['plugin'] as $value => $title) {
 					$response->addScript("selectbox_add_option('exec[plugin]','$title', '$value',false);");
 				}
 			}
@@ -216,13 +218,13 @@
 		*/
 		public function ajax_get_definitions($appname, $plugin) {
 			$options = self::get_select_options(array('appname'=>$appname, 'plugin'=>$plugin));
+			$response = new xajaxResponse();
+			$response->addScript("clear_options('exec[definition]');");
 			if(is_array($options['definition'])) {
 				foreach ($options['definition'] as $value => $title) {
-					$sel_options['definition'] .= '<option value="'. $value. '" >'. $title. '</option>';
+					$response->addScript("selectbox_add_option('exec[definition]','$title', '$value',false);");
 				}
 			}
-			$response = new xajaxResponse();
-			$response->addAssign('exec[definition]','innerHTML',$sel_options['definition']);
 			return $response->getXML();
 		}
 
diff --git a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
index fa96d540b9..8e07478c6d 100644
--- a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
+++ b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
@@ -185,7 +185,7 @@ class importexport_wizard_basic_import_csv
 			array_shift($content['csv_fields']);
 			// Need to move everything down 1 to remove header, but shift will re-key
 			unset($content['field_mapping'][0]);
-			unset($content['field_conversion'][0]);
+			if(is_array($content['field_conversion'])) unset($content['field_conversion'][0]);
 			foreach(array('field_mapping', 'field_conversion') as $field) {
 				foreach($content[$field] as $key => $value)
 				{
diff --git a/importexport/js/importexport.js b/importexport/js/importexport.js
new file mode 100644
index 0000000000..8366b2e0c4
--- /dev/null
+++ b/importexport/js/importexport.js
@@ -0,0 +1,13 @@
+/**
+* Common functions for import / export
+*/
+
+/**
+* Clear a selectbox
+*/
+function clear_options(id) {
+	var list = document.getElementById(id);
+	for(var count = list.options.length - 1; count >= 0; count--)	{
+		list.options[count] = null;
+	}
+}